Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2021-04-07 17:40:52 +0300
committerBastien Montagne <bastien@blender.org>2021-04-08 12:45:44 +0300
commit89e353354f11c8470ff5ef307926e609d6069be2 (patch)
tree573916290fe2b9af01c13edc98dfe0fa17a66c53 /source/blender/editors/space_outliner/outliner_draw.c
parent92dfc8f2673e14b8518c07d3d4234ee375243a9e (diff)
Outliner Override: Tweak to order of error messages.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c11
1 files changed, 5 insertions, 6 deletions
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;