[Bf-blender-cvs] [3210cb0af59] temp-outliner-library-override-hierarchy: Address points from review

Julian Eisel noreply at git.blender.org
Tue Apr 26 22:21:12 CEST 2022


Commit: 3210cb0af5971c3df457d507e36280ebccd7cfaf
Author: Julian Eisel
Date:   Tue Apr 26 22:20:37 2022 +0200
Branches: temp-outliner-library-override-hierarchy
https://developer.blender.org/rB3210cb0af5971c3df457d507e36280ebccd7cfaf

Address points from review

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

M	source/blender/editors/space_outliner/outliner_utils.cc
M	source/blender/editors/util/ed_util_ops.cc

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

diff --git a/source/blender/editors/space_outliner/outliner_utils.cc b/source/blender/editors/space_outliner/outliner_utils.cc
index 4fbaf47e0f5..4b947154864 100644
--- a/source/blender/editors/space_outliner/outliner_utils.cc
+++ b/source/blender/editors/space_outliner/outliner_utils.cc
@@ -324,11 +324,13 @@ float outliner_right_columns_width(const SpaceOutliner *space_outliner)
     case SO_LIBRARIES:
       return 0.0f;
     case SO_OVERRIDES_LIBRARY:
-      if (space_outliner->lib_override_view_mode == SO_LIB_OVERRIDE_VIEW_PROPERTIES) {
-        num_columns = OL_RNA_COL_SIZEX / UI_UNIT_X;
-      }
-      else if (space_outliner->lib_override_view_mode == SO_LIB_OVERRIDE_VIEW_HIERARCHIES) {
-        num_columns = 1;
+      switch ((eSpaceOutliner_LibOverrideViewMode)space_outliner->lib_override_view_mode) {
+        case SO_LIB_OVERRIDE_VIEW_PROPERTIES:
+          num_columns = OL_RNA_COL_SIZEX / UI_UNIT_X;
+          break;
+        case SO_LIB_OVERRIDE_VIEW_HIERARCHIES:
+          num_columns = 1;
+          break;
       }
       break;
     case SO_ID_ORPHANS:
diff --git a/source/blender/editors/util/ed_util_ops.cc b/source/blender/editors/util/ed_util_ops.cc
index 12e066b8be8..803e65590a0 100644
--- a/source/blender/editors/util/ed_util_ops.cc
+++ b/source/blender/editors/util/ed_util_ops.cc
@@ -329,8 +329,7 @@ static void ED_OT_lib_id_override_editable_toggle(wmOperatorType *ot)
 {
   /* identifiers */
   ot->name = "Toggle Library Override Editable";
-  ot->description =
-      "Set if this linked data-block can be changed in the UI through library overrides";
+  ot->description = "Set if this library override data-block can be edited";
   ot->idname = "ED_OT_lib_id_override_editable_toggle";
 
   /* api callbacks */



More information about the Bf-blender-cvs mailing list