[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43562] branches/bmesh/blender/source/ blender: quiet some warnings
Campbell Barton
ideasman42 at gmail.com
Fri Jan 20 15:44:46 CET 2012
Revision: 43562
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43562
Author: campbellbarton
Date: 2012-01-20 14:44:38 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
quiet some warnings
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-01-20 14:33:03 UTC (rev 43561)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-01-20 14:44:38 UTC (rev 43562)
@@ -344,10 +344,11 @@
BMFace *BM_Split_Face(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, BMLoop **nl, BMEdge *UNUSED(example))
{
+ const int has_mdisp = CustomData_has_layer(&bm->ldata, CD_MDISPS);
BMFace *nf, *of;
/*do we have a multires layer?*/
- if (CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
+ if (has_mdisp) {
of = BM_Copy_Face(bm, f, 0, 0);
}
@@ -357,8 +358,8 @@
BM_Copy_Attributes(bm, bm, f, nf);
copy_v3_v3(nf->no, f->no);
- /*handle multires update*/
- if (nf != f && CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
+ /* handle multires update */
+ if (has_mdisp && (nf != f)) {
BMLoop *l;
l = bm_firstfaceloop(f);
Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c 2012-01-20 14:33:03 UTC (rev 43561)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c 2012-01-20 14:44:38 UTC (rev 43562)
@@ -3217,6 +3217,7 @@
if (hide) {
if (facemode) {
/*check that every UV is selected*/
+ luv = NULL;
BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
if (!(luv->flag & MLOOPUV_VERTSEL))
Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c 2012-01-20 14:33:03 UTC (rev 43561)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c 2012-01-20 14:44:38 UTC (rev 43562)
@@ -149,7 +149,7 @@
{
float (*coords)[3], (*co)[3];
MLoopUV *mloop_uv;
- MTexPoly *mtexpoly, *mt;
+ MTexPoly *mtexpoly, *mt = NULL;
int i, numVerts, numPolys, numLoops;
Image *image = umd->image;
MPoly *mpoly, *mp;
More information about the Bf-blender-cvs
mailing list