[Bf-blender-cvs] [8408a8fda2f] master: LibOverride: Fix outliner menu showing 'override editing' entries for linked overrides.

Bastien Montagne noreply at git.blender.org
Fri Mar 26 18:15:25 CET 2021


Commit: 8408a8fda2f2e635b8351a17c75ea7b8ce5e548c
Author: Bastien Montagne
Date:   Fri Mar 26 18:13:54 2021 +0100
Branches: master
https://developer.blender.org/rB8408a8fda2f2e635b8351a17c75ea7b8ce5e548c

LibOverride: Fix outliner menu showing 'override editing' entries for linked overrides.

One can only resync, reset, delete etc. locl overrides, linked ones are
basically regular linked IDs and fully not editable.

Reported by Demeter from the Studio, thanks.

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

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

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

diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 21ddea922d8..95ff42a9946 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -1873,7 +1873,7 @@ static bool outliner_id_operation_item_poll(bContext *C,
     case OUTLINER_IDOP_OVERRIDE_LIBRARY_RESYNC_HIERARCHY:
     case OUTLINER_IDOP_OVERRIDE_LIBRARY_RESYNC_HIERARCHY_ENFORCE:
     case OUTLINER_IDOP_OVERRIDE_LIBRARY_DELETE_HIERARCHY:
-      if (ID_IS_OVERRIDE_LIBRARY_REAL(tselem->id)) {
+      if (ID_IS_OVERRIDE_LIBRARY_REAL(tselem->id) && !ID_IS_LINKED(tselem->id)) {
         return true;
       }
       return false;



More information about the Bf-blender-cvs mailing list