From d3c45535529603a90e47343d088df1dec750c81d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 1 May 2015 19:17:14 +0200 Subject: Fix a couple of harmless compiler warnings. --- source/blender/bmesh/operators/bmo_connect_concave.c | 4 ++-- source/blender/bmesh/tools/bmesh_intersect.c | 4 +--- source/blender/editors/sculpt_paint/paint_image_proj.c | 2 +- source/blender/gpu/intern/gpu_debug.c | 1 + 4 files changed, 5 insertions(+), 6 deletions(-) (limited to 'source/blender') diff --git a/source/blender/bmesh/operators/bmo_connect_concave.c b/source/blender/bmesh/operators/bmo_connect_concave.c index a00f65bd10f..107aead6994 100644 --- a/source/blender/bmesh/operators/bmo_connect_concave.c +++ b/source/blender/bmesh/operators/bmo_connect_concave.c @@ -79,8 +79,8 @@ static bool bm_face_split_by_concave( struct Heap *pf_heap, struct EdgeHash *pf_ehash) { const int f_base_len = f_base->len; - int faces_array_tot = f_base->len - 3; - int edges_array_tot = f_base->len - 3; + int faces_array_tot = f_base_len - 3; + int edges_array_tot = f_base_len - 3; BMFace **faces_array = BLI_array_alloca(faces_array, faces_array_tot); BMEdge **edges_array = BLI_array_alloca(edges_array, edges_array_tot); const int quad_method = 0, ngon_method = 0; /* beauty */ diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c index 76a289feaaa..b11a22b5854 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.c +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -1267,10 +1267,8 @@ bool BM_mesh_intersect( face_edges_split(bm, f, e_ls_base); } } -#else - (void)totface_orig; #endif /* USE_NET */ - + (void)totface_orig; #ifdef USE_SEPARATE if (use_separate) { diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index b74dcb73acd..4085f13999d 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -3886,7 +3886,7 @@ static void project_paint_begin( { ProjPaintLayerClone layer_clone; ProjPaintFaceLookup face_lookup; - MTFace *tf_base; + MTFace *tf_base = NULL; MemArena *arena; /* at the moment this is just ps->arena_mt[0], but use this to show were not multithreading */ diff --git a/source/blender/gpu/intern/gpu_debug.c b/source/blender/gpu/intern/gpu_debug.c index a0dde9c8f3b..7bcc51aef31 100644 --- a/source/blender/gpu/intern/gpu_debug.c +++ b/source/blender/gpu/intern/gpu_debug.c @@ -356,6 +356,7 @@ void gpu_assert_no_gl_errors(const char* file, int line, const char* str) GLboolean gl_ok = gpu_report_gl_errors(file, line, str); BLI_assert(gl_ok); + (void) gl_ok; } } -- cgit v1.2.3