[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27422] branches/bmesh/blender: BMesh branch

Ken Hughes khughes at pacific.edu
Thu Mar 11 19:27:47 CET 2010


Revision: 27422
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27422
Author:   khughes
Date:     2010-03-11 19:27:45 +0100 (Thu, 11 Mar 2010)

Log Message:
-----------
BMesh branch
------------
Fix some gcc warnings and errors (under linux anyway).

Modified Paths:
--------------
    branches/bmesh/blender/intern/guardedalloc/intern/mallocn.c
    branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c
    branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
    branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
    branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
    branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c
    branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
    branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
    branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
    branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
    branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c
    branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
    branches/bmesh/blender/source/blender/editors/space_logic/logic_buttons.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c

Modified: branches/bmesh/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/bmesh/blender/intern/guardedalloc/intern/mallocn.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/intern/guardedalloc/intern/mallocn.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -85,7 +85,7 @@
 
 static volatile struct localListBase _membase;
 static volatile struct localListBase *membase = &_membase;
-static void (*error_callback)(char *) = NULL;
+static void (*error_callback)(const char *) = NULL;
 static void (*thread_lock_callback)(void) = NULL;
 static void (*thread_unlock_callback)(void) = NULL;
 
@@ -147,7 +147,7 @@
 }
 
 
-void MEM_set_error_callback(void (*func)(char *))
+void MEM_set_error_callback(void (*func)(const char *))
 {
 	error_callback = func;
 }

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h	2010-03-11 18:27:45 UTC (rev 27422)
@@ -86,6 +86,7 @@
 
 #include "BKE_customdata.h"
 #include "BKE_bvhutils.h"
+#include "BKE_tessmesh.h"
 
 struct MVert;
 struct MEdge;
@@ -641,7 +642,7 @@
 
 /* returns an array of deform matrices for crazyspace correction, and the
    number of modifiers left */
-int editbmesh_get_first_deform_matrices(struct Scene *, struct Object *, struct EditMesh *em,
+int editbmesh_get_first_deform_matrices(struct Scene *, struct Object *, struct BMEditMesh *em,
                                        float (**deformmats)[3][3], float (**deformcos)[3]);
 
 void weight_to_rgb(float input, float *fr, float *fg, float *fb);

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -83,7 +83,7 @@
 	/*alloc our layers*/
 	if(data->totlayer){
 		/*alloc memory*/
-		data->layers = MEM_callocN(sizeof(BME_CustomDataLayer)*data->totlayer, "BMesh Custom Data Layers", 1);
+		data->layers = MEM_callocN(sizeof(BME_CustomDataLayer)*data->totlayer, "BMesh Custom Data Layers");
 		data->pool = BLI_mempool_create(data->totsize, initalloc, initalloc, 1);
 		/*initialize layer data*/
 		for(i=0; i < BME_CD_NUMTYPES; i++){

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -1113,7 +1113,7 @@
 
 static void emDM_drawFacesTex(void *dm, int (*setDrawOptions)(MTFace *tface, int has_vcol, int matnr))
 {
-	emDM_drawFacesTex_common(dm, setDrawOptions, NULL, NULL);
+	emDM_drawFacesTex_common(dm, (int (*)(struct MTFace *, struct MCol *, int))setDrawOptions, NULL, NULL);
 }
 
 static void emDM_drawMappedFacesTex(void *dm, int (*setDrawOptions)(void *userData, int index), void *userData)
@@ -1843,7 +1843,8 @@
 		dliter = dfiter->getLoopsIter(dfiter);
 		for (; !dliter->done; dliter->step(dliter), totloop++) {
 			BLI_array_growone(wlcol);
-			calc_weightpaint_vert_color(ob, coba, dliter->vindex, &wlcol[totloop]);			 
+			calc_weightpaint_vert_color(ob, coba, dliter->vindex, (unsigned
+char *)&wlcol[totloop]);			 
 		}
 	}
 

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/anim.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/anim.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -55,6 +55,7 @@
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_windowmanager_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_vfont_types.h"
 

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -51,6 +51,7 @@
 #include "DNA_lattice_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_text_types.h"
+#include "DNA_windowmanager_types.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_action.h"

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/curve.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/curve.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -51,6 +51,7 @@
 #include "DNA_key_types.h"  
 #include "DNA_scene_types.h"  
 #include "DNA_vfont_types.h"  
+#include "DNA_meshdata_types.h"  
 
 #include "BKE_animsys.h"
 #include "BKE_anim.h"  

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -39,6 +39,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_windowmanager_types.h"
 
 #include "BKE_shrinkwrap.h"
 #include "BKE_DerivedMesh.h"

Modified: branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -28,6 +28,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BKE_utildefines.h"
+#include "BKE_tessmesh.h"
 
 #include "BLI_math.h"
 #include "BLI_rand.h"
@@ -35,6 +36,7 @@
 #include "BLI_array.h"
 
 #include "DNA_object_types.h"
+#include "DNA_windowmanager_types.h"
 
 #include "ED_mesh.h"
 

Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -10,6 +10,7 @@
 #include "DNA_key_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_windowmanager_types.h"
 
 #include "BKE_customdata.h" 
 #include "BKE_utildefines.h"
@@ -722,4 +723,4 @@
 	}
 
 	if(oldverts) MEM_freeN(oldverts);
-}
\ No newline at end of file
+}

Modified: branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -4,6 +4,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_windowmanager_types.h"
 
 #include "BKE_utildefines.h"
 

Modified: branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -28,6 +28,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BKE_utildefines.h"
+#include "BKE_tessmesh.h"
 
 #include "BLI_math.h"
 #include "BLI_rand.h"
@@ -35,6 +36,7 @@
 #include "BLI_array.h"
 
 #include "DNA_object_types.h"
+#include "DNA_windowmanager_types.h"
 
 #include "ED_mesh.h"
 

Modified: branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -33,7 +33,10 @@
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
+#include "BKE_tessmesh.h"
 
+#include "bmesh.h"
+
 #include "UI_interface.h"
 #include "UI_view2d.h"
 

Modified: branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_image/image_ops.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/editors/space_image/image_ops.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -40,6 +40,7 @@
 #include "DNA_texture_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_windowmanager_types.h"
+#include "DNA_meshdata_types.h"
 
 #include "BKE_colortools.h"
 #include "BKE_context.h"
@@ -52,6 +53,7 @@
 #include "BKE_packedFile.h"
 #include "BKE_report.h"
 #include "BKE_screen.h"
+#include "BKE_tessmesh.h"
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
@@ -66,6 +68,8 @@
 #include "RNA_types.h"
 #include "RNA_enum_types.h"
 
+#include "bmesh.h"
+
 #include "ED_image.h"
 #include "ED_screen.h"
 #include "ED_space_api.h"

Modified: branches/bmesh/blender/source/blender/editors/space_logic/logic_buttons.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_logic/logic_buttons.c	2010-03-11 18:21:17 UTC (rev 27421)
+++ branches/bmesh/blender/source/blender/editors/space_logic/logic_buttons.c	2010-03-11 18:27:45 UTC (rev 27422)
@@ -33,6 +33,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list