Simple warning fixes

4 files changed, 5 insertions, 7 deletions

diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index 131c8cb5aaf..dc7c9dcd5e5 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -35,7 +35,7 @@ struct Lattice;
 struct Object;
 struct DerivedMesh;
 struct BPoint;
-struct MDeform;
+struct MDeformVert;
 
 extern struct Lattice *editLatt;
 
@@ -68,7 +68,7 @@ float (*lattice_getVertexCos(struct Object *ob, int *numVerts_r))[3];
 void lattice_applyVertexCos(struct Object *ob, float (*vertexCos)[3]);
 void lattice_calc_modifiers(struct Object *ob);
 
-struct MDeform* lattice_get_deform_verts(struct Object *lattice);
+struct MDeformVert* lattice_get_deform_verts(struct Object *lattice);
 
 #endif
 
diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h
index d016348da3e..eed22ff9d8e 100644
--- a/source/blender/blenkernel/BKE_shrinkwrap.h
+++ b/source/blender/blenkernel/BKE_shrinkwrap.h
@@ -96,7 +96,7 @@ void space_transform_invert_normal(const SpaceTransform *data, float *no);
 struct Object;
 struct DerivedMesh;
 struct ShrinkwrapModifierData;
-struct MDeform;
+struct MDeformVert;
 struct BVHTree;
 
 
@@ -110,7 +110,7 @@ typedef struct ShrinkwrapCalcData
 	float (*vertexCos)[3];			//vertexs being shrinkwraped
 	int numVerts;
 
-	struct MDeform* dvert;			//Pointer to mdeform array
+	struct MDeformVert* dvert;			//Pointer to mdeform array
 	int vgroup;						//Vertex group num
 
 	struct DerivedMesh *target;		//mesh we are shrinking to	
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 2737cac149e..6614c657647 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -929,7 +929,7 @@ void lattice_calc_modifiers(Object *ob)
 	}
 }
 
-struct MDeform* lattice_get_deform_verts(struct Object *oblatt)
+struct MDeformVert* lattice_get_deform_verts(struct Object *oblatt)
 {
 	if(oblatt->type == OB_LATTICE)
 	{
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 5f80a2c7227..b37087064cb 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -69,8 +69,6 @@
 
 #include "reeb.h"
 
-/* REPLACE WITH NEW ONE IN UTILDEFINES ONCE PATCH IS APPLIED */
-#define FTOCHAR(val) (val<=0.0f)? 0 : ((val>(1.0f-0.5f/255.0f))? 255 : (char)((255.0f*val)+0.5f))
 
 ReebGraph *GLOBAL_RG = NULL;
 ReebGraph *FILTERED_RG = NULL;