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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-11-03 09:19:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-11-03 09:19:55 +0400
commitec32964194966927f24a02ba4a0c63437e99bd5e (patch)
treeafa4740257b44154fe74a1d06e57e756941c3973 /source
parent348addd7d2dff6bb2d898a1db014332311fa0dcc (diff)
code cleanup: warnings
Diffstat (limited to 'source')
-rw-r--r--source/blender/bmesh/operators/bmo_wireframe.c6
-rw-r--r--source/blender/editors/transform/transform.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/bmesh/operators/bmo_wireframe.c b/source/blender/bmesh/operators/bmo_wireframe.c
index 2e5db5210c4..7f1008813ad 100644
--- a/source/blender/bmesh/operators/bmo_wireframe.c
+++ b/source/blender/bmesh/operators/bmo_wireframe.c
@@ -172,9 +172,9 @@ void bmo_wireframe_exec(BMesh *bm, BMOperator *op)
BMIter itersub;
/* filled only with boundary verts */
- BMVert **verts_src = MEM_mallocN(sizeof(BMVert **) * totvert_orig, __func__);
- BMVert **verts_neg = MEM_mallocN(sizeof(BMVert **) * totvert_orig, __func__);
- BMVert **verts_pos = MEM_mallocN(sizeof(BMVert **) * totvert_orig, __func__);
+ BMVert **verts_src = MEM_mallocN(sizeof(BMVert *) * totvert_orig, __func__);
+ BMVert **verts_neg = MEM_mallocN(sizeof(BMVert *) * totvert_orig, __func__);
+ BMVert **verts_pos = MEM_mallocN(sizeof(BMVert *) * totvert_orig, __func__);
/* will over-alloc, but makes for easy lookups by index to keep aligned */
BMVert **verts_boundary = use_boundary ?
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 9909f438734..ab2732d4e8c 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -4262,7 +4262,7 @@ static void applyShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
}
}
BLI_snprintf(str + ofs, MAX_INFO_LEN - ofs, IFACE_(" or Alt) Even Thickness %s"),
- WM_bool_as_string(t->flag & T_ALT_TRANSFORM));
+ WM_bool_as_string((t->flag & T_ALT_TRANSFORM) != 0));
/* done with header string */
@@ -6946,7 +6946,7 @@ static void headerSeqSlide(TransInfo *t, float val[2], char str[MAX_INFO_LEN])
}
}
ofs += BLI_snprintf(str + ofs, MAX_INFO_LEN - ofs, IFACE_(" or Alt) Expand to fit %s"),
- WM_bool_as_string(t->flag & T_ALT_TRANSFORM));
+ WM_bool_as_string((t->flag & T_ALT_TRANSFORM) != 0));
}
static void applySeqSlideValue(TransInfo *t, const float val[2])