[Bf-blender-cvs] [f4abac2d781] greasepencil-object: Add bContext to Lattice modifier data for future uses

[Antonio Vazquez]

Commit: f4abac2d7812b7bc3a07a7fce709d5c7da9df322
Author: Antonio Vazquez
Date:   Mon Jul 31 12:14:23 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf4abac2d7812b7bc3a07a7fce709d5c7da9df322

Add bContext to Lattice modifier data for future uses

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

M	source/blender/editors/object/object_modifier.c
M	source/blender/makesdna/DNA_modifier_types.h

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

diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 04568276ded..a7a57f8899f 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -660,11 +660,15 @@ static int modifier_apply_obdata(ReportList *reports, const bContext *C, Scene *
 		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	}
 	else if (ELEM(ob->type, OB_GPENCIL)) {
-		/* array modifier need to have bContext */
+		/* some modifier need to have bContext */
 		if (md->type = eModifierType_GpencilArray) {
 			GpencilArrayModifierData *mmd = (GpencilArrayModifierData *)md;
 			mmd->C = (void *) C;
 		}
+		if (md->type = eModifierType_GpencilLattice) {
+			GpencilLatticeModifierData *mmd = (GpencilLatticeModifierData *)md;
+			mmd->C = (void *)C;
+		}
 		mti->applyModifier(md, &eval_ctx, ob, NULL, 0);
 		if (ob->gpd) {
 			BKE_gpencil_batch_cache_dirty(ob->gpd);
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 8580f259d27..3b2e178cef6 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1776,6 +1776,7 @@ typedef struct GpencilLatticeModifierData {
 	float strength;
 	char pad[4];
 	void *cache_data; /* runtime only (LatticeDeformData) */
+	void *C;                     /* bContext used only for apply */
 } GpencilLatticeModifierData;
 
 typedef enum eGpencilLattice_Flag {