[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17314] trunk/blender/source/blender: Simple warning fixes

[André Pinto]

Revision: 17314
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17314
Author:   jaguarandi
Date:     2008-11-04 02:05:44 +0100 (Tue, 04 Nov 2008)

Log Message:
-----------
Simple warning fixes

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_lattice.h
    trunk/blender/source/blender/blenkernel/BKE_shrinkwrap.h
    trunk/blender/source/blender/blenkernel/intern/lattice.c
    trunk/blender/source/blender/src/reeb.c

Modified: trunk/blender/source/blender/blenkernel/BKE_lattice.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_lattice.h       2008-11-04 
00:15:27 UTC (rev 17313)
+++ trunk/blender/source/blender/blenkernel/BKE_lattice.h       2008-11-04 
01:05:44 UTC (rev 17314)
@@ -35,7 +35,7 @@
 struct Object;
 struct DerivedMesh;
 struct BPoint;
-struct MDeform;
+struct MDeformVert;
 
 extern struct Lattice *editLatt;
 
@@ -68,7 +68,7 @@
 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
 

Modified: trunk/blender/source/blender/blenkernel/BKE_shrinkwrap.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_shrinkwrap.h    2008-11-04 
00:15:27 UTC (rev 17313)
+++ trunk/blender/source/blender/blenkernel/BKE_shrinkwrap.h    2008-11-04 
01:05:44 UTC (rev 17314)
@@ -96,7 +96,7 @@
 struct Object;
 struct DerivedMesh;
 struct ShrinkwrapModifierData;
-struct MDeform;
+struct MDeformVert;
 struct BVHTree;
 
 
@@ -110,7 +110,7 @@
        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      

Modified: trunk/blender/source/blender/blenkernel/intern/lattice.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/lattice.c    2008-11-04 
00:15:27 UTC (rev 17313)
+++ trunk/blender/source/blender/blenkernel/intern/lattice.c    2008-11-04 
01:05:44 UTC (rev 17314)
@@ -929,7 +929,7 @@
        }
 }
 
-struct MDeform* lattice_get_deform_verts(struct Object *oblatt)
+struct MDeformVert* lattice_get_deform_verts(struct Object *oblatt)
 {
        if(oblatt->type == OB_LATTICE)
        {

Modified: trunk/blender/source/blender/src/reeb.c
===================================================================
--- trunk/blender/source/blender/src/reeb.c     2008-11-04 00:15:27 UTC (rev 
17313)
+++ trunk/blender/source/blender/src/reeb.c     2008-11-04 01:05:44 UTC (rev 
17314)
@@ -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;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs