[Bf-blender-cvs] [c6d1e7e6dca] override-recursive-resync: Fix modifier deform by armature check ignoring virtual modifiers

Campbell Barton noreply at git.blender.org
Mon Jun 14 16:35:01 CEST 2021


Commit: c6d1e7e6dca891efb3110acff6c790ea7b649ed9
Author: Campbell Barton
Date:   Sun Jun 13 14:46:59 2021 +1000
Branches: override-recursive-resync
https://developer.blender.org/rBc6d1e7e6dca891efb3110acff6c790ea7b649ed9

Fix modifier deform by armature check ignoring virtual modifiers

Regression in f00cb93dbec7bf5dc05302c868f20fcd5aed7db7 (fix for T63125)

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

M	source/blender/blenkernel/intern/modifier.c

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

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 3b67237f5eb..e60f0102b9a 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -729,7 +729,6 @@ Object *BKE_modifiers_is_deformed_by_armature(Object *ob)
     ArmatureGpencilModifierData *agmd = NULL;
     GpencilModifierData *gmd = BKE_gpencil_modifiers_get_virtual_modifierlist(
         ob, &gpencilvirtualModifierData);
-    gmd = ob->greasepencil_modifiers.first;
 
     /* return the first selected armature, this lets us use multiple armatures */
     for (; gmd; gmd = gmd->next) {
@@ -749,7 +748,6 @@ Object *BKE_modifiers_is_deformed_by_armature(Object *ob)
     VirtualModifierData virtualModifierData;
     ArmatureModifierData *amd = NULL;
     ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData);
-    md = ob->modifiers.first;
 
     /* return the first selected armature, this lets us use multiple armatures */
     for (; md; md = md->next) {



More information about the Bf-blender-cvs mailing list