[Bf-blender-cvs] [b49e9726286] temp-outliner-library-override-hierarchy: Address review comments

[Julian Eisel]

Commit: b49e9726286e4849b110b59825675a5b444ffa18
Author: Julian Eisel
Date:   Wed Mar 30 21:29:32 2022 +0200
Branches: temp-outliner-library-override-hierarchy
https://developer.blender.org/rBb49e9726286e4849b110b59825675a5b444ffa18

Address review comments

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

M	source/blender/editors/space_outliner/outliner_draw.cc
M	source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchy.cc
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc
index a3d85862a13..d204e12b41d 100644
--- a/source/blender/editors/space_outliner/outliner_draw.cc
+++ b/source/blender/editors/space_outliner/outliner_draw.cc
@@ -3899,6 +3899,12 @@ void draw_outliner(const bContext *C)
   /* Default to no emboss for outliner UI. */
   UI_block_emboss_set(block, UI_EMBOSS_NONE_OR_STATUS);
 
+  if (space_outliner->outlinevis == SO_OVERRIDES_LIBRARY) {
+    /* Draw overrides status columns. */
+    outliner_draw_overrides_warning_buts(
+        block, region, space_outliner, &space_outliner->tree, true);
+  }
+
   if (space_outliner->outlinevis == SO_DATA_API) {
     int buttons_start_x = outliner_data_api_buttons_start_x(tree_width);
     /* draw rna buttons */
@@ -3915,10 +3921,6 @@ void draw_outliner(const bContext *C)
   }
   else if ((space_outliner->outlinevis == SO_OVERRIDES_LIBRARY) &&
            (space_outliner->lib_override_view_mode == SO_LIB_OVERRIDE_VIEW_PROPERTIES)) {
-    /* Draw overrides status columns. */
-    outliner_draw_overrides_warning_buts(
-        block, region, space_outliner, &space_outliner->tree, true);
-
     UI_block_emboss_set(block, UI_EMBOSS);
     UI_block_flag_enable(block, UI_BLOCK_NO_DRAW_OVERRIDDEN_STATE);
     const int x = region->v2d.cur.xmax - right_column_width;
diff --git a/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchy.cc b/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchy.cc
index 688e8bb0657..1c0e2953278 100644
--- a/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchy.cc
+++ b/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchy.cc
@@ -182,8 +182,8 @@ static int build_hierarchy_foreach_ID_cb(LibraryIDLinkCallbackData *cb_data)
     return IDWALK_RET_NOP;
   }
 
-  /* Avoid duplicates: If there is an sibling for this ID already, the same ID is just used
-   * multiple times by the same parent. */
+  /* Avoid duplicates: If there is a sibling for this ID already, the same ID is just used multiple
+   * times by the same parent. */
   if (build_data.sibling_ids.lookup_key_default(&id, nullptr)) {
     return IDWALK_RET_NOP;
   }
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 11a882c617d..19e69b4bb94 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -3598,7 +3598,8 @@ static void rna_def_space_outliner(BlenderRNA *brna)
        "PROPERTIES",
        ICON_NONE,
        "Properties",
-       "Display all data-blocks with their overridden properties and buttons do edit them"},
+       "Display all local override data-blocks with their overridden properties and buttons do "
+       "edit them"},
       {SO_LIB_OVERRIDE_VIEW_HIERARCHY,
        "HIERARCHY",
        ICON_NONE,