[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36604] branches/bmesh/blender/source/ blender: fixed 4 uses of un-inirialized vars + some compiler warnings.
Campbell Barton
ideasman42 at gmail.com
Wed May 11 01:48:09 CEST 2011
Revision: 36604
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36604
Author: campbellbarton
Date: 2011-05-10 23:48:09 +0000 (Tue, 10 May 2011)
Log Message:
-----------
fixed 4 uses of un-inirialized vars + some compiler warnings.
Modified Paths:
--------------
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/subsurf_ccg.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
branches/bmesh/blender/source/blender/editors/armature/reeb.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/loopcut.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c 2011-05-10 23:48:09 UTC (rev 36604)
@@ -2215,6 +2215,9 @@
t = BM_LOOPS_OF_FACE; break;
case BM_FACE:
t = BM_FACES_OF_MESH; break;
+ default: /* should never happen */
+ BLI_assert(!"invalid type given");
+ t = BM_VERTS_OF_MESH;
}
if (t != BM_LOOPS_OF_FACE) {
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2011-05-10 23:48:09 UTC (rev 36604)
@@ -236,7 +236,7 @@
}
tm->tottri = i;
- tm->looptris = looptris;
+ tm->looptris = (BMLoop *(*)[3])looptris;
}
void BMEdit_RecalcTesselation(BMEditMesh *tm)
@@ -1534,7 +1534,8 @@
BMVert *eve;
BMIter iter;
int i;
-
+
+ i= 0;
BM_ITER(eve, &iter, emdm->tc->bm, BM_VERTS_OF_MESH, NULL) {
if (emdm->vertexCos) {
copy_v3_v3(cos_r[i], emdm->vertexCos[i]);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-05-10 23:48:09 UTC (rev 36604)
@@ -1165,8 +1165,8 @@
MEdge medge;
int i, totedge = cgdm_getNumEdges(dm);
- fiter->cgdm = dm;
- fiter->liter.cgdm = dm;
+ fiter->cgdm = (CCGDerivedMesh *)dm;
+ fiter->liter.cgdm = (CCGDerivedMesh *)dm;
fiter->mface = fiter->mf = dm->dupTessFaceArray(dm);
fiter->mf--;
@@ -3113,7 +3113,7 @@
}
}
- return result;
+ return (DerivedMesh *)result;
}
void subsurf_calculate_limit_positions(Mesh *me, float (*positions_r)[3])
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2011-05-10 23:48:09 UTC (rev 36604)
@@ -402,17 +402,24 @@
}
/*funnily enough, I think this is identical to face_to_crn_interp, heh*/
-double quad_coord(double aa[3], double bb[3], double cc[3], double dd[3], int a1, int a2)
+static double quad_coord(double aa[3], double bb[3], double cc[3], double dd[3], int a1, int a2)
{
- double x, y, z, c, f1, f2;
+ double x, y, z, f1;
x = aa[a1]*cc[a2]-cc[a1]*aa[a2];
y = aa[a1]*dd[a2]+bb[a1]*cc[a2]-cc[a1]*bb[a2]-dd[a1]*aa[a2];
z = bb[a1]*dd[a2]-dd[a1]*bb[a2];
if (fabs(2*(x-y+z)) > DBL_EPSILON*10.0) {
+ double f2;
+
f1 = (sqrt(y*y-4.0*x*z) - y + 2.0*z) / (2.0*(x-y+z));
f2 = (-sqrt(y*y-4.0*x*z) - y + 2.0*z) / (2.0*(x-y+z));
+
+ f1= fabs(f1);
+ f2= fabs(f2);
+ f1 = MIN2(f1, f2);
+ CLAMP(f1, 0.0, 1.0+DBL_EPSILON);
} else {
f1 = -z/(y - 2*z);
CLAMP(f1, 0.0, 1.0+DBL_EPSILON);
@@ -427,12 +434,8 @@
return cc[(i+1)%2] / fabs(dd[(i+1)%2] - cc[(i+1)%2]);
}
}
- return f1;
}
-
- f1 = MIN2(fabs(f1), fabs(f2));
- CLAMP(f1, 0.0, 1.0+DBL_EPSILON);
-
+
return f1;
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2011-05-10 23:48:09 UTC (rev 36604)
@@ -80,7 +80,7 @@
BMFace *f, *f2;
BMEdge *e, *keepedge=NULL, *baseedge=NULL;
BMLoop *loop;
- int done, len;
+ int done, len= 0;
if(BM_Nonmanifold_Vert(bm, v)) {
return 0;
@@ -89,7 +89,6 @@
if(v->e){
/*v->e we keep, what else?*/
e = v->e;
- len = 0;
do{
e = bmesh_disk_nextedge(e,v);
if(!(BM_Edge_Share_Faces(e, v->e))){
Modified: branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/connectops.c 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/bmesh/operators/connectops.c 2011-05-10 23:48:09 UTC (rev 36604)
@@ -68,7 +68,7 @@
loops[BLI_array_count(loops)-1] = loops[0];
}
- BM_LegalSplits(bm, f, loops, BLI_array_count(loops)/2);
+ BM_LegalSplits(bm, f, (BMLoop *(*)[2])loops, BLI_array_count(loops)/2);
for (i=0; i<BLI_array_count(loops)/2; i++) {
if (loops[i*2]==NULL) continue;
Modified: branches/bmesh/blender/source/blender/editors/armature/reeb.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/armature/reeb.c 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/editors/armature/reeb.c 2011-05-10 23:48:09 UTC (rev 36604)
@@ -3384,6 +3384,7 @@
ReebGraph *BIF_ReebGraphMultiFromEditMesh(bContext *C)
{
+ (void)C;
return NULL;
#if 0
Scene *scene = CTX_data_scene(C);
Modified: branches/bmesh/blender/source/blender/editors/interface/resources.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/interface/resources.c 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/editors/interface/resources.c 2011-05-10 23:48:09 UTC (rev 36604)
@@ -408,7 +408,7 @@
case TH_PIN:
cp= ts->pin; break;
case TH_PIN_OPAC:
- cp= &ts->pin_opac; break;
+ cp= &ts->pin_opac; break; /*XXX BMESH_TODO*/
case TH_PREVIEW_BACK:
cp= ts->preview_back;
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c 2011-05-10 23:48:09 UTC (rev 36604)
@@ -103,7 +103,8 @@
BMVert *eve, *v1;
BMIter iter;
int i;
-
+
+ i= 0;
BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
if (BM_TestHFlag(eve, BM_SELECT) && !BM_TestHFlag(eve, BM_HIDDEN)) {
v1= editbmesh_get_x_mirror_vert(obedit, em, eve, eve->co, i);
Modified: branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/loopcut.c 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/editors/mesh/loopcut.c 2011-05-10 23:48:09 UTC (rev 36604)
@@ -339,7 +339,7 @@
}
/* called when modal loop selection is done... */
-static void ringsel_exit(bContext *C, wmOperator *op)
+static void ringsel_exit(bContext *UNUSED(C), wmOperator *op)
{
tringselOpData *lcd= op->customdata;
Modified: branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c 2011-05-10 23:48:09 UTC (rev 36604)
@@ -177,8 +177,13 @@
}
}
-static void copy_editface_active_customdata(EditMesh *em, int type, int index)
+static void copy_editface_active_customdata(BMEditMesh *em, int type, int index)
{
+#if 1 /*BMESH_TODO*/
+ (void)em;
+ (void)type;
+ (void)index;
+#else
EditFace *efa;
int n= CustomData_get_active_layer(&em->fdata, type);
@@ -186,6 +191,7 @@
void *data= CustomData_em_get_n(&em->fdata, efa->data, type, n);
CustomData_em_set_n(&em->fdata, efa->data, type, index, data);
}
+#endif
}
int ED_mesh_uv_texture_add(bContext *C, Mesh *me, const char *name, int active_set)
Modified: branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h 2011-05-10 23:48:09 UTC (rev 36604)
@@ -55,6 +55,8 @@
struct BMEdge;
struct BMFace;
struct wmOperator;
+struct wmKeyMap;
+struct wmKeyConfig;
/* ******************** bmeshutils.c */
Modified: branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c 2011-05-10 23:38:40 UTC (rev 36603)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c 2011-05-10 23:48:09 UTC (rev 36604)
@@ -2084,7 +2084,7 @@
BMIter feiter;
BMFace *fe;
- int fcount, fpcount = 0;
+ int fcount = 0, fpcount = 0;
int pin = 0;
/* If pinned faces are drawn then only draw pinned edges at the borders.
More information about the Bf-blender-cvs
mailing list