[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36608] branches/bmesh/blender/source/ blender: set many vars & functions as static,

Campbell Barton ideasman42 at gmail.com
Wed May 11 04:14:44 CEST 2011


Revision: 36608
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36608
Author:   campbellbarton
Date:     2011-05-11 02:14:43 +0000 (Wed, 11 May 2011)
Log Message:
-----------
set many vars & functions as static,
also commented invalid pin theme alpha assignment so bmesh branch builds with -Werror

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h
    branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
    branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/blenlib/intern/BLI_cellalloc.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
    branches/bmesh/blender/source/blender/bmesh/operators/createops.c
    branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
    branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
    branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
    branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
    branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
    branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
    branches/bmesh/blender/source/blender/bmesh/operators/utils.c
    branches/bmesh/blender/source/blender/editors/interface/resources.c
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
    branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
    branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
    branches/bmesh/blender/source/blender/editors/mesh/editface.c
    branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
    branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
    branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h	2011-05-11 00:59:22 UTC (rev 36607)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h	2011-05-11 02:14:43 UTC (rev 36608)
@@ -96,6 +96,9 @@
 void CustomData_copy(const struct CustomData *source, struct CustomData *dest,
 					 CustomDataMask mask, int alloctype, int totelem);
 
+/* TODO, not really a public function but readfile.c needs it */
+void CustomData_update_typemap(struct CustomData *data);
+
 /* same as the above, except that this will preserve existing layers, and only
  * add the layers that were not there yet */
 void CustomData_merge(const struct CustomData *source, struct CustomData *dest,

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-05-11 00:59:22 UTC (rev 36607)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-05-11 02:14:43 UTC (rev 36608)
@@ -155,27 +155,27 @@
 	return tmp;
 }
 
-CustomData *dm_getVertCData(DerivedMesh *dm)
+static CustomData *dm_getVertCData(DerivedMesh *dm)
 {
 	return &dm->vertData;
 }
 
-CustomData *dm_getEdgeCData(DerivedMesh *dm)
+static CustomData *dm_getEdgeCData(DerivedMesh *dm)
 {
 	return &dm->edgeData;
 }
 
-CustomData *dm_getFaceCData(DerivedMesh *dm)
+static CustomData *dm_getFaceCData(DerivedMesh *dm)
 {
 	return &dm->faceData;
 }
 
-CustomData *dm_getLoopCData(DerivedMesh *dm)
+static CustomData *dm_getLoopCData(DerivedMesh *dm)
 {
 	return &dm->loopData;
 }
 
-CustomData *dm_getPolyCData(DerivedMesh *dm)
+static CustomData *dm_getPolyCData(DerivedMesh *dm)
 {
 	return &dm->polyData;
 }
@@ -272,7 +272,7 @@
 	}
 }
 
-void dm_add_polys_from_iter(CustomData *ldata, CustomData *pdata, DerivedMesh *dm, int totloop)
+static void dm_add_polys_from_iter(CustomData *ldata, CustomData *pdata, DerivedMesh *dm, int totloop)
 {
 	DMFaceIter *iter = dm->newFaceIter(dm);
 	DMLoopIter *liter;
@@ -507,7 +507,7 @@
 	CustomData_add_layer(&dm->faceData, type, alloctype, layer, dm->numFaceData);
 }
 
-void DM_add_loop_layer(DerivedMesh *dm, int type, int alloctype, void *layer)
+static void DM_add_loop_layer(DerivedMesh *dm, int type, int alloctype, void *layer)
 {
 	CustomData_add_layer(&dm->loopData, type, alloctype, layer, dm->numLoopData);
 }

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-05-11 00:59:22 UTC (rev 36607)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-05-11 02:14:43 UTC (rev 36608)
@@ -1666,7 +1666,7 @@
 	return dm;
 }
 
-DerivedMesh *disabled__CDDM_from_editmesh(EditMesh *em, Mesh *UNUSED(me))
+static DerivedMesh *disabled__CDDM_from_editmesh(EditMesh *em, Mesh *UNUSED(me))
 {
 	DerivedMesh *dm = CDDM_new(BLI_countlist(&em->verts),
 	                           BLI_countlist(&em->edges),
@@ -2028,12 +2028,12 @@
 	CDDM_LoopIter liter;
 } CDDM_FaceIter;
 
-void cddm_freeiter(void *self)
+static void cddm_freeiter(void *self)
 {
 	MEM_freeN(self);
 }
 
-void cddm_stepiter(void *self)
+static void cddm_stepiter(void *self)
 {
 	CDDM_FaceIter *iter = self;
 	MPoly *mp;
@@ -2055,7 +2055,7 @@
 	iter->head.len = mp->totloop;
 }
 
-void *cddm_faceiter_getcddata(void *self, int type, int layer)
+static void *cddm_faceiter_getcddata(void *self, int type, int layer)
 {
 	CDDM_FaceIter *iter = self;
 
@@ -2065,7 +2065,7 @@
 		                    iter->head.index, layer);
 }
 
-void *cddm_loopiter_getcddata(void *self, int type, int layer)
+static void *cddm_loopiter_getcddata(void *self, int type, int layer)
 {
 	CDDM_LoopIter *iter = self;
 
@@ -2075,7 +2075,7 @@
 	                             iter->head.index, layer);
 }
 
-void *cddm_loopiter_getvertcddata(void *self, int type, int layer)
+static void *cddm_loopiter_getvertcddata(void *self, int type, int layer)
 {
 	CDDM_LoopIter *iter = self;
 
@@ -2086,7 +2086,7 @@
 	                             iter->cddm->mloop[iter->head.index].v, layer);
 }
 
-DMLoopIter *cddmiter_get_loopiter(void *self)
+static DMLoopIter *cddmiter_get_loopiter(void *self)
 {
 	CDDM_FaceIter *iter = self;
 	CDDM_LoopIter *liter = &iter->liter;
@@ -2102,7 +2102,7 @@
 	return (DMLoopIter*) liter;
 }
 
-void cddm_loopiter_step(void *self)
+static void cddm_loopiter_step(void *self)
 {
 	CDDM_LoopIter *liter = self;
 	MLoop *ml;

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c	2011-05-11 00:59:22 UTC (rev 36607)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c	2011-05-11 02:14:43 UTC (rev 36608)
@@ -1015,7 +1015,7 @@
 static CustomDataLayer *customData_add_layer__internal(CustomData *data,
 	int type, int alloctype, void *layerdata, int totelem, const char *name);
 
-void customData_update_typemap(CustomData *data)
+void CustomData_update_typemap(CustomData *data)
 {
 	int i, lasttype = -1;
 
@@ -1078,7 +1078,7 @@
 		}
 	}
 
-	customData_update_typemap(dest);
+	CustomData_update_typemap(dest);
 }
 
 void CustomData_copy(const struct CustomData *source, struct CustomData *dest,
@@ -1143,7 +1143,7 @@
 	}
 
 	data->totsize = offset;
-	customData_update_typemap(data);
+	CustomData_update_typemap(data);
 }
 
 int CustomData_get_layer_index(const CustomData *data, int type)
@@ -1448,7 +1448,7 @@
 	
 	layer = customData_add_layer__internal(data, type, alloctype, layerdata,
 										   totelem, typeInfo->defaultname);
-	customData_update_typemap(data);
+	CustomData_update_typemap(data);
 
 	if(layer)
 		return layer->data;
@@ -1464,7 +1464,7 @@
 	
 	layer = customData_add_layer__internal(data, type, alloctype, layerdata,
 										   totelem, name);
-	customData_update_typemap(data);
+	CustomData_update_typemap(data);
 
 	if(layer)
 		return layer->data;
@@ -1503,7 +1503,7 @@
 		customData_resize(data, -CUSTOMDATA_GROW);
 
 	customData_update_offsets(data);
-	customData_update_typemap(data);
+	CustomData_update_typemap(data);
 
 	return 1;
 }

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c	2011-05-11 00:59:22 UTC (rev 36607)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c	2011-05-11 02:14:43 UTC (rev 36608)
@@ -1461,7 +1461,7 @@
 	else return CustomData_bmesh_get_n(&iter->bm->vdata, iter->l->v->head.data, type, layer);
 }
 
-void bmDM_iterFree(void *self)
+static void bmDM_iterFree(void *self)
 {
 	MEM_freeN(self);
 }
@@ -1470,7 +1470,7 @@
 {
 }
 
-DMLoopIter *bmDM_newLoopsIter(void *faceiter)
+static DMLoopIter *bmDM_newLoopsIter(void *faceiter)
 {
 	bmDM_faceIter *fiter = faceiter;
 	bmDM_loopIter *iter = &fiter->loopiter;
@@ -1570,35 +1570,35 @@
 	}
 }
 
-CustomData *bmDm_getVertDataLayout(DerivedMesh *dm)
+static CustomData *bmDm_getVertDataLayout(DerivedMesh *dm)
 {
 	EditDerivedBMesh *bmdm = (EditDerivedBMesh*)dm;
 
 	return &bmdm->tc->bm->vdata;
 }
 
-CustomData *bmDm_getEdgeDataLayout(DerivedMesh *dm)
+static CustomData *bmDm_getEdgeDataLayout(DerivedMesh *dm)
 {
 	EditDerivedBMesh *bmdm = (EditDerivedBMesh*)dm;
 
 	return &bmdm->tc->bm->edata;
 }
 
-CustomData *bmDm_getTessFaceDataLayout(DerivedMesh *dm)
+static CustomData *bmDm_getTessFaceDataLayout(DerivedMesh *dm)
 {
 	EditDerivedBMesh *bmdm = (EditDerivedBMesh*)dm;
 
 	return &bmdm->dm.faceData;
 }
 
-CustomData *bmDm_getLoopDataLayout(DerivedMesh *dm)
+static CustomData *bmDm_getLoopDataLayout(DerivedMesh *dm)
 {
 	EditDerivedBMesh *bmdm = (EditDerivedBMesh*)dm;
 
 	return &bmdm->tc->bm->ldata;
 }
 
-CustomData *bmDm_getFaceDataLayout(DerivedMesh *dm)
+static CustomData *bmDm_getFaceDataLayout(DerivedMesh *dm)
 {
 	EditDerivedBMesh *bmdm = (EditDerivedBMesh*)dm;
 

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c	2011-05-11 00:59:22 UTC (rev 36607)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c	2011-05-11 02:14:43 UTC (rev 36608)
@@ -130,7 +130,7 @@
 
 /*thresh is threshold for comparing vertices, uvs, vertex colors,
   weights, etc.*/
-int customdata_compare(CustomData *c1, CustomData *c2, Mesh *m1, Mesh *m2, float thresh)
+static int customdata_compare(CustomData *c1, CustomData *c2, Mesh *m1, Mesh *m2, float thresh)
 {
 	CustomDataLayer *l1, *l2;
 	int i, i1=0, i2=0, tot, j;
@@ -1825,7 +1825,7 @@
 }
 
 
-void bmesh_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex, int numCol) 
+static void bmesh_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex, int numCol)
 {
 	MTFace *texface;
 	MTexPoly *texpoly;
@@ -1835,10 +1835,11 @@
 	MFace *mf;
 	int i;
 
+	mf = me->mface + findex;
+
 	for(i=0; i < numTex; i++){
 		texface = CustomData_get_n(&me->fdata, CD_MTFACE, findex, i);
 		texpoly = CustomData_get_n(&me->pdata, CD_MTEXPOLY, findex, i); 
-		mf = me->mface + findex;
 		
 		texpoly->tpage = texface->tpage;
 		texpoly->flag = texface->flag;
@@ -1858,7 +1859,6 @@
 	}
 
 	for(i=0; i < numCol; i++){
-		mf = me->mface + findex;
 		mloopcol = CustomData_get_n(&me->ldata, CD_MLOOPCOL, loopstart, i);
 		mcol = CustomData_get_n(&me->fdata, CD_MCOL, findex, i);
 

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2011-05-11 00:59:22 UTC (rev 36607)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2011-05-11 02:14:43 UTC (rev 36608)
@@ -456,7 +456,7 @@
 	return wtable->weight_table[faceLen].w;
 }
 
-void free_ss_weights(WeightTable *wtable)
+static void free_ss_weights(WeightTable *wtable)
 {
 	int i;
 
@@ -586,15 +586,15 @@
 
 /***/
 
-int ccgDM_getVertMapIndex(CCGSubSurf *ss, CCGVert *v) {
+static int ccgDM_getVertMapIndex(CCGSubSurf *ss, CCGVert *v) {

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list