[Bf-blender-cvs] [ab5d0d2df3e] master: Cleanup: Remove some references to proxies in comments/log messages.

Bastien Montagne noreply at git.blender.org
Wed Sep 7 10:27:25 CEST 2022


Commit: ab5d0d2df3ef98cd4aa3614e9696b0dc3f5bba5f
Author: Bastien Montagne
Date:   Wed Sep 7 10:25:58 2022 +0200
Branches: master
https://developer.blender.org/rBab5d0d2df3ef98cd4aa3614e9696b0dc3f5bba5f

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

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.

===================================================================

M	source/blender/blenkernel/BKE_idprop.h
M	source/blender/blenkernel/BKE_lib_query.h
M	source/blender/editors/object/object_edit.c
M	source/blender/makesrna/intern/rna_pose.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h
index c14da538e7c..e9b075aeb49 100644
--- a/source/blender/blenkernel/BKE_idprop.h
+++ b/source/blender/blenkernel/BKE_idprop.h
@@ -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)
diff --git a/source/blender/blenkernel/BKE_lib_query.h b/source/blender/blenkernel/BKE_lib_query.h
index 48cffcf8d2c..a70d128cd95 100644
--- a/source/blender/blenkernel/BKE_lib_query.h
+++ b/source/blender/blenkernel/BKE_lib_query.h
@@ -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),
 
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index fed03b5eabd..1bfb0c5f260 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -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;
   }
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index e1a46b01db2..182f3ff6afa 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -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;
   }



More information about the Bf-blender-cvs mailing list