[Bf-blender-cvs] [3a2935983ce] greasepencil-object: Cleanup: make LatticeDeformData private again

[Campbell Barton]

Commit: 3a2935983ce7c3f4a4f0dec66eccf1d3ce7d47e8
Author: Campbell Barton
Date:   Fri May 11 16:17:06 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB3a2935983ce7c3f4a4f0dec66eccf1d3ce7d47e8

Cleanup: make LatticeDeformData private again

Matches master/2.8 branch.

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

M	source/blender/blenkernel/BKE_lattice.h
M	source/blender/blenkernel/intern/gpencil_modifier.c
M	source/blender/blenkernel/intern/lattice.c
M	source/blender/modifiers/intern/MOD_gpencillattice.c

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

diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index 6dc2952cc85..05b63e72a77 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -55,12 +55,6 @@ void BKE_lattice_free(struct Lattice *lt);
 void BKE_lattice_make_local(struct Main *bmain, struct Lattice *lt, const bool lib_local);
 void calc_lat_fudu(int flag, int res, float *r_fu, float *r_du);
 
-typedef struct LatticeDeformData {
-	struct Object *object;
-	float *latticedata;
-	float latmat[4][4];
-} LatticeDeformData;
-
 struct LatticeDeformData *init_latt_deform(struct Object *oblatt, struct Object *ob) ATTR_WARN_UNUSED_RESULT;
 void calc_latt_deform(struct LatticeDeformData *lattice_deform_data, float co[3], float weight);
 void end_latt_deform(struct LatticeDeformData *lattice_deform_data);
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 129c3a63e84..6c22bd9b533 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -311,11 +311,11 @@ void BKE_gpencil_lattice_init(Object *ob)
 				return;
 			}
 			if (mmd->cache_data) {
-				end_latt_deform((LatticeDeformData *)mmd->cache_data);
+				end_latt_deform((struct LatticeDeformData *)mmd->cache_data);
 			}
 
 			/* init deform data */
-			mmd->cache_data = (LatticeDeformData *)init_latt_deform(latob, ob);
+			mmd->cache_data = (struct LatticeDeformData *)init_latt_deform(latob, ob);
 		}
 	}
 }
@@ -328,7 +328,7 @@ void BKE_gpencil_lattice_clear(Object *ob)
 		if (md->type == eModifierType_Gpencil_Lattice) {
 			LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md;
 			if ((mmd) && (mmd->cache_data)) {
-				end_latt_deform((LatticeDeformData *)mmd->cache_data);
+				end_latt_deform((struct LatticeDeformData *)mmd->cache_data);
 				mmd->cache_data = NULL;
 			}
 		}
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 688a5bcd828..b9b894db9a5 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -62,7 +62,6 @@
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
-#include "BKE_gpencil.h"
 
 #include "BKE_deform.h"
 
@@ -335,6 +334,12 @@ void BKE_lattice_make_local(Main *bmain, Lattice *lt, const bool lib_local)
 	BKE_id_make_local_generic(bmain, &lt->id, true, lib_local);
 }
 
+typedef struct LatticeDeformData {
+	Object *object;
+	float *latticedata;
+	float latmat[4][4];
+} LatticeDeformData;
+
 LatticeDeformData *init_latt_deform(Object *oblatt, Object *ob)
 {
 	/* we make an array with all differences */
@@ -1219,7 +1224,6 @@ void BKE_lattice_translate(Lattice *lt, float offset[3], bool do_keys)
 void BKE_lattice_eval_geometry(struct Depsgraph *UNUSED(depsgraph),
                                Lattice *UNUSED(latt))
 {
-
 }
 
 /* Draw Engine */
diff --git a/source/blender/modifiers/intern/MOD_gpencillattice.c b/source/blender/modifiers/intern/MOD_gpencillattice.c
index 9922db2c183..4f5b780fc62 100644
--- a/source/blender/modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/modifiers/intern/MOD_gpencillattice.c
@@ -95,7 +95,7 @@ static void deformStroke(ModifierData *md, Depsgraph *UNUSED(depsgraph),
 			continue;
 		}
 
-		calc_latt_deform((LatticeDeformData *)mmd->cache_data, &pt->x, mmd->strength * weight);
+		calc_latt_deform((struct LatticeDeformData *)mmd->cache_data, &pt->x, mmd->strength * weight);
 	}
 }
 
@@ -108,7 +108,7 @@ static void bakeModifierGP(const bContext *C, Depsgraph *depsgraph,
 	LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md;
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = md->scene;
-	LatticeDeformData *ldata = NULL;
+	struct LatticeDeformData *ldata = NULL;
 	bGPdata *gpd = ob->data;
 	int oldframe = CFRA;
 
@@ -134,7 +134,7 @@ static void bakeModifierGP(const bContext *C, Depsgraph *depsgraph,
 	}
 	
 	/* free lingering data */
-	ldata = (LatticeDeformData *)mmd->cache_data;
+	ldata = (struct LatticeDeformData *)mmd->cache_data;
 	if (ldata) {
 		end_latt_deform(ldata);
 		mmd->cache_data = NULL;
@@ -148,7 +148,7 @@ static void bakeModifierGP(const bContext *C, Depsgraph *depsgraph,
 static void freeData(ModifierData *md)
 {
 	LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md;
-	LatticeDeformData *ldata = (LatticeDeformData *)mmd->cache_data;
+	struct LatticeDeformData *ldata = (struct LatticeDeformData *)mmd->cache_data;
 	/* free deform data */
 	if (ldata) {
 		end_latt_deform(ldata);