[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44673] trunk/blender/source/blender: quiet some warnings and fix build error with strict casting rules.
Campbell Barton
ideasman42 at gmail.com
Tue Mar 6 13:51:26 CET 2012
Revision: 44673
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44673
Author: campbellbarton
Date: 2012-03-06 12:51:17 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
quiet some warnings and fix build error with strict casting rules.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
trunk/blender/source/blender/modifiers/intern/MOD_build.c
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-03-06 12:27:42 UTC (rev 44672)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-03-06 12:51:17 UTC (rev 44673)
@@ -1810,9 +1810,11 @@
dest_offset = dest_index * typeInfo->size;
if (!src_data || !dest_data) {
- printf("%s: warning null data for %s type (%p --> %p), skipping\n",
- __func__, layerType_getName(source->layers[src_i].type),
- (void *)src_data, (void *)dest_data);
+ if (src_data != NULL && dest_data != NULL) {
+ printf("%s: warning null data for %s type (%p --> %p), skipping\n",
+ __func__, layerType_getName(source->layers[src_i].type),
+ (void *)src_data, (void *)dest_data);
+ }
continue;
}
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-03-06 12:27:42 UTC (rev 44672)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-03-06 12:51:17 UTC (rev 44673)
@@ -2597,7 +2597,7 @@
MovieClip *clip = object_get_movieclip(sce, sce->camera, 1);
if(clip)
- dag_id_flush_update(sce, clip);
+ dag_id_flush_update(sce, &clip->id);
}
/* update editors */
Modified: trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2012-03-06 12:27:42 UTC (rev 44672)
+++ trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2012-03-06 12:51:17 UTC (rev 44673)
@@ -45,7 +45,7 @@
{
MVert *mv, *mvert;
MEdge *me, *medge;
- MPoly *mpoly, *mp;
+ MPoly /* *mpoly, */ /* UNUSED */ *mp;
MLoop *mloop, *ml;
BMVert *v, **vtable, **verts = NULL;
BMEdge *e, **etable, **edges = NULL;
@@ -53,7 +53,7 @@
BMIter liter;
BLI_array_declare(verts);
BLI_array_declare(edges);
- int i, j, k, totvert, totedge, totface;
+ int i, j, k, totvert, totedge /* , totface */ /* UNUSED */ ;
/*merge custom data layout*/
CustomData_bmesh_merge(&dm->vertData, &bm->vdata, CD_MASK_DERIVEDMESH, CD_CALLOC, bm, BM_VERT);
@@ -63,7 +63,7 @@
totvert = dm->getNumVerts(dm);
totedge = dm->getNumEdges(dm);
- totface = dm->getNumPolys(dm);
+ /* totface = dm->getNumPolys(dm); */ /* UNUSED */
vtable = MEM_callocN(sizeof(void**) * totvert, "vert table in BMDM_Copy");
etable = MEM_callocN(sizeof(void**) * totedge, "edge table in BMDM_Copy");
@@ -93,7 +93,7 @@
MEM_freeN(medge);
/*do faces*/
- mpoly = mp = dm->getPolyArray(dm);
+ /* mpoly = mp = dm->getPolyArray(dm); */ /* UNUSED */
mloop = dm->getLoopArray(dm);
for (i = 0; i < dm->numPolyData; i++, mp++) {
BMLoop *l;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-03-06 12:27:42 UTC (rev 44672)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-03-06 12:51:17 UTC (rev 44673)
@@ -312,7 +312,9 @@
}
}
- if (deselect) BM_vert_select_set(bm, verts[i], FALSE);
+ if (deselect) {
+ BM_vert_select_set(bm, verts[i], FALSE);
+ }
}
}
else {
@@ -366,8 +368,7 @@
break;
}
- if (!f2)
- {
+ if (!f2) {
BM_elem_select_set(bm, l->e, FALSE);
}
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c 2012-03-06 12:27:42 UTC (rev 44672)
+++ trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c 2012-03-06 12:51:17 UTC (rev 44673)
@@ -151,7 +151,9 @@
v->head.hflag = BM_vert_flag_from_mflag(mvert->flag);
/* this is necessary for selection counts to work properl */
- if (BM_elem_flag_test(v, BM_ELEM_SELECT)) BM_vert_select_set(bm, v, TRUE);
+ if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
+ BM_vert_select_set(bm, v, TRUE);
+ }
normal_short_to_float_v3(v->no, mvert->no);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_mirror.c 2012-03-06 12:27:42 UTC (rev 44672)
+++ trunk/blender/source/blender/bmesh/operators/bmo_mirror.c 2012-03-06 12:51:17 UTC (rev 44673)
@@ -47,12 +47,13 @@
float imtx[4][4];
float scale[3] = {1.0f, 1.0f, 1.0f};
float dist = BMO_slot_float_get(op, "mergedist");
- int i, ototvert, ototedge, axis = BMO_slot_int_get(op, "axis");
+ int i, ototvert /*, ototedge */;
+ int axis = BMO_slot_int_get(op, "axis");
int mirroru = BMO_slot_bool_get(op, "mirror_u");
int mirrorv = BMO_slot_bool_get(op, "mirror_v");
ototvert = bm->totvert;
- ototedge = bm->totedge;
+ /* ototedge = bm->totedge; */ /* UNUSED */
BMO_slot_mat4_get(op, "mat", mtx);
invert_m4_m4(imtx, mtx);
Modified: trunk/blender/source/blender/modifiers/intern/MOD_build.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_build.c 2012-03-06 12:27:42 UTC (rev 44672)
+++ trunk/blender/source/blender/modifiers/intern/MOD_build.c 2012-03-06 12:51:17 UTC (rev 44673)
@@ -88,7 +88,7 @@
int *vertMap, *edgeMap, *faceMap;
float frac;
MPoly *mpoly_dst;
- MLoop *ml_dst, *ml_src, *mloop_dst;
+ MLoop *ml_dst, *ml_src /*, *mloop_dst */;
GHashIterator *hashIter;
/* maps vert indices in old mesh to indices in new mesh */
GHash *vertHash = BLI_ghash_new(BLI_ghashutil_inthash,
@@ -261,7 +261,7 @@
}
mpoly_dst = CDDM_get_polys(result);
- mloop_dst = ml_dst = CDDM_get_loops(result);
+ /* mloop_dst = */ ml_dst = CDDM_get_loops(result);
/* copy the faces across, remapping indices */
k = 0;
More information about the Bf-blender-cvs
mailing list