[Bf-blender-cvs] [89e353354f1] master: Outliner Override: Tweak to order of error messages.

Bastien Montagne noreply at git.blender.org
Thu Apr 8 11:48:23 CEST 2021


Commit: 89e353354f11c8470ff5ef307926e609d6069be2
Author: Bastien Montagne
Date:   Wed Apr 7 16:40:52 2021 +0200
Branches: master
https://developer.blender.org/rB89e353354f11c8470ff5ef307926e609d6069be2

Outliner Override: Tweak to order of error messages.

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

M	source/blender/editors/space_outliner/outliner_draw.c

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

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 14d7cf7abd4..92cd50560e4 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1795,18 +1795,17 @@ static bool outliner_draw_overrides_buts(uiBlock *block,
       case TSE_LIBRARY_OVERRIDE_BASE: {
         ID *id = tselem->id;
 
-        if (ID_IS_OVERRIDE_LIBRARY_REAL(id) && ID_REAL_USERS(id) == 0) {
+        if (id->flag & LIB_LIB_OVERRIDE_RESYNC_LEFTOVER) {
           item_has_warnings = true;
           if (do_draw) {
-            tip = TIP_("This override data-block is unused");
+            tip = TIP_(
+                "This override data-block is not needed anymore, but was detected as user-edited");
           }
         }
-
-        else if (id->flag & LIB_LIB_OVERRIDE_RESYNC_LEFTOVER) {
+        else if (ID_IS_OVERRIDE_LIBRARY_REAL(id) && ID_REAL_USERS(id) == 0) {
           item_has_warnings = true;
           if (do_draw) {
-            tip = TIP_(
-                "This override data-block is not needed anymore, but was detected as user-edited");
+            tip = TIP_("This override data-block is unused");
           }
         }
         break;



More information about the Bf-blender-cvs mailing list