[Bf-blender-cvs] [b3702f59188] blender-v2.90-release: Fix part of T79635: Disable by default operation on unknown mod from liboverride object.

Bastien Montagne noreply at git.blender.org
Wed Aug 12 11:12:51 CEST 2020


Commit: b3702f5918863eb743406b4543552a1ca7f00c19
Author: Bastien Montagne
Date:   Wed Aug 12 10:47:44 2020 +0200
Branches: blender-v2.90-release
https://developer.blender.org/rBb3702f5918863eb743406b4543552a1ca7f00c19

Fix part of T79635: Disable by default operation on unknown mod from liboverride object.

It is unfortunate that we cannot get active modifier from context when
operator is called from a shortcut, but we'd need an event for this to
work... So for now forbid any modifier operation of liboverride objects
in that case.

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

M	source/blender/editors/object/object_modifier.c

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

diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index e93bd8bd94e..17dc7a36a42 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1022,7 +1022,7 @@ bool edit_modifier_poll_generic(bContext *C,
   }
 
   if (ID_IS_OVERRIDE_LIBRARY(ob)) {
-    if ((mod != NULL) && (mod->flag & eModifierFlag_OverrideLibrary_Local) == 0) {
+    if ((mod == NULL) || (mod->flag & eModifierFlag_OverrideLibrary_Local) == 0) {
       CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers coming from library override");
       return false;
     }



More information about the Bf-blender-cvs mailing list