[Bf-blender-cvs] [bdafec84889] greasepencil-object: Cleanup: Review modifier stack for lattice

Antonio Vazquez noreply at git.blender.org
Mon Jul 31 13:19:39 CEST 2017


Commit: bdafec84889c4ade31e49b6223f2781554eeb7c5
Author: Antonio Vazquez
Date:   Mon Jul 31 11:56:20 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBbdafec84889c4ade31e49b6223f2781554eeb7c5

Cleanup: Review modifier stack for lattice

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

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

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

diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 6bbe6ddc855..ddf7ebbbc3c 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -645,21 +645,23 @@ bool BKE_gpencil_use_this_lattice(Object *ob, Object *UNUSED(lattice))
 /* init lattice deform data */
 void BKE_gpencil_lattice_init(Object *ob)
 {
-	ModifierData *md = modifiers_findByType(ob, eModifierType_GpencilLattice);
-	if (md) {
-		GpencilLatticeModifierData *mmd = (GpencilLatticeModifierData *)md;
-		Object *latob = NULL;
+	ModifierData *md;
+	for (md = ob->modifiers.first; md; md = md->next) {
+		if (md->type == eModifierType_GpencilLattice) {
+			GpencilLatticeModifierData *mmd = (GpencilLatticeModifierData *)md;
+			Object *latob = NULL;
 
-		latob = mmd->object;
-		if ((!latob) || (latob->type != OB_LATTICE)) {
-			return;
-		}
-		if (mmd->cache_data) {
-			end_latt_deform((LatticeDeformData *)mmd->cache_data);
-		}
+			latob = mmd->object;
+			if ((!latob) || (latob->type != OB_LATTICE)) {
+				return;
+			}
+			if (mmd->cache_data) {
+				end_latt_deform((LatticeDeformData *)mmd->cache_data);
+			}
 
-		/* init deform data */
-		mmd->cache_data = (LatticeDeformData *)init_latt_deform(latob, ob);
+			/* init deform data */
+			mmd->cache_data = (LatticeDeformData *)init_latt_deform(latob, ob);
+		}
 	}
 }




More information about the Bf-blender-cvs mailing list