[Bf-blender-cvs] [6351c73b758] master: Fix T88954: Rearranging of modifiers for linked objects no longer works.

Bastien Montagne noreply at git.blender.org
Wed Sep 29 12:54:05 CEST 2021


Commit: 6351c73b758d1b2f4d6b9e85c9bf07074b369be5
Author: Bastien Montagne
Date:   Wed Sep 29 12:52:48 2021 +0200
Branches: master
https://developer.blender.org/rB6351c73b758d1b2f4d6b9e85c9bf07074b369be5

Fix T88954: Rearranging of modifiers for linked objects no longer works.

There would be no modifier set in context in drag and drop case, in that
case try to get active modifier from active object instead.

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

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 b9942bc563a..125cd65631a 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1044,6 +1044,10 @@ bool edit_modifier_poll_generic(bContext *C,
   Object *ob = (ptr.owner_id) ? (Object *)ptr.owner_id : ED_object_active_context(C);
   ModifierData *mod = ptr.data; /* May be NULL. */
 
+  if (mod == NULL && ob != NULL) {
+    mod = BKE_object_active_modifier(ob);
+  }
+
   if (!ob || ID_IS_LINKED(ob)) {
     return false;
   }
@@ -1923,8 +1927,8 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op)
     return OPERATOR_CANCELLED;
   }
 
-  const eMultiresSubdivideModeType subdivide_mode = (eMultiresSubdivideModeType)(RNA_enum_get(
-      op->ptr, "mode"));
+  const eMultiresSubdivideModeType subdivide_mode = (eMultiresSubdivideModeType)(
+      RNA_enum_get(op->ptr, "mode"));
   multiresModifier_subdivide(object, mmd, subdivide_mode);
 
   ED_object_iter_other(



More information about the Bf-blender-cvs mailing list