From ec32964194966927f24a02ba4a0c63437e99bd5e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 3 Nov 2013 05:19:55 +0000 Subject: [PATCH] code cleanup: warnings --- source/blender/bmesh/operators/bmo_wireframe.c | 6 +++--- source/blender/editors/transform/transform.c | 4 ++-- 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])