[Bf-blender-cvs] [fd4a629b4da] greasepencil-object: Move LatticeDeformData struct definition to header

Antonio Vazquez noreply at git.blender.org
Fri Jul 28 16:09:22 CEST 2017


Commit: fd4a629b4da6f4185ec4584897ce1165834b9ff3
Author: Antonio Vazquez
Date:   Thu Jul 27 12:13:46 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBfd4a629b4da6f4185ec4584897ce1165834b9ff3

Move LatticeDeformData struct definition to header

This struct is used outside of the lattice module now and the definition now can be shared in other modules.

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

M	source/blender/blenkernel/BKE_lattice.h
M	source/blender/blenkernel/intern/lattice.c

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

diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index fe3d388178e..22cc30a0fd7 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -53,7 +53,12 @@ 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);
 
-struct LatticeDeformData;
+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/lattice.c b/source/blender/blenkernel/intern/lattice.c
index fd984c17356..d0fb6f58852 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -333,12 +333,6 @@ 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 */




More information about the Bf-blender-cvs mailing list