griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Remove some references to proxies in comments/log messages.

Browse Source 
Note that there are still some references to proxies left, in some cases
it's unclear if the code related to the comment is even still relevant,
this goes beyond mere cleanup to address then.
This commit is contained in:
Bastien Montagne
2022-09-07 10:25:58 +02:00
parent 17d8028181
commit ab5d0d2df3
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_idprop.h
View File

@@ -98,7 +98,7 @@ void IDP_AssignID(struct IDProperty *prop, struct ID *id, int flag);
* Sync values from one group to another when values name and types match,
* copy the values, else ignore.
*
* \note Use for syncing proxies.
* \note Was used for syncing proxies.
*/
void IDP_SyncGroupValues(struct IDProperty *dest, const struct IDProperty *src) ATTR_NONNULL();
void IDP_SyncGroupTypes(struct IDProperty *dest, const struct IDProperty *src, bool do_arraylen)

1
source/blender/blenkernel/BKE_lib_query.h
View File

@@ -36,7 +36,6 @@ enum {
/**
* Indicates whether this is direct (i.e. by local data) or indirect (i.e. by linked data) usage.
* \note Object proxies are half-local, half-linked...
*/
IDWALK_CB_INDIRECT_USAGE = (1 << 2),

4
source/blender/editors/object/object_edit.c
View File

@@ -889,13 +889,13 @@ static bool editmode_toggle_poll(bContext *C)
{
Object *ob = CTX_data_active_object(C);
/* covers proxies too */
/* Covers liboverrides too. */
if (ELEM(NULL, ob, ob->data) || ID_IS_LINKED(ob->data) || ID_IS_OVERRIDE_LIBRARY(ob) ||
ID_IS_OVERRIDE_LIBRARY(ob->data)) {
return false;
}
/* if hidden but in edit mode, we still display */
/* If hidden but in edit mode, we still display. */
if ((ob->visibility_flag & OB_HIDE_VIEWPORT) && !(ob->mode & OB_MODE_EDIT)) {
return false;
}

2
source/blender/makesrna/intern/rna_pose.c
View File

@@ -127,7 +127,7 @@ static char *rna_PoseBone_path(const PointerRNA *ptr)
static bool rna_bone_group_poll(Object *ob, ReportList *reports)
{
if (ID_IS_OVERRIDE_LIBRARY(ob)) {
BKE_report(reports, RPT_ERROR, "Cannot edit bone groups for proxies or library overrides");
BKE_report(reports, RPT_ERROR, "Cannot edit bone groups for library overrides");
return false;
}