Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-01-20 18:44:38 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-01-20 18:44:38 +0400
commit9c03a8ca77c9e6663aad7e11f74bc4fc59838590 (patch)
tree46578e87fcd77a67b7f3032bdc484786292597e6
parent4de28741c8f1f23651cf91479b4c96969362e1ff (diff)
quiet some warnings
-rw-r--r--source/blender/bmesh/intern/bmesh_mods.c7
-rw-r--r--source/blender/editors/uvedit/uvedit_ops.c1
-rw-r--r--source/blender/modifiers/intern/MOD_uvproject.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index e5b44b08abe..806a0eedecf 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -344,10 +344,11 @@ BMEdge *BM_Connect_Verts(BMesh *bm, BMVert *v1, BMVert *v2, BMFace **nf)
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 @@ BMFace *BM_Split_Face(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, BMLoop **nl,
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);
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 60886f2a713..fd868f1c935 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -3217,6 +3217,7 @@ static int hide_exec(bContext *C, wmOperator *op)
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))
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c
index 603d379c357..7cd65236c5d 100644
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/source/blender/modifiers/intern/MOD_uvproject.c
@@ -149,7 +149,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
{
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;