Fix a couple of harmless compiler warnings.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 1 May 2015 17:17:14 +0000 (19:17 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 1 May 2015 17:18:26 +0000 (19:18 +0200)
source/blender/bmesh/operators/bmo_connect_concave.c
source/blender/bmesh/tools/bmesh_intersect.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/gpu/intern/gpu_debug.c

index a00f65bd10f2d9184abb17738790ad6eec264f47..107aead6994c5b7be6e8c64339f5deb9bd7016bf 100644 (file)
@@ -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 */
index 76a289feaaa69ee5d5c500c1db7b462e33900916..b11a22b5854c74b13cb5d7e31f20104ce5169eb6 100644 (file)
@@ -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) {
index b74dcb73acde3fc682d4e6daf58e07a4ff682995..4085f13999d0fe273d3b65442339f933625a0480 100644 (file)
@@ -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 */
 
index a0dde9c8f3bdf6214ba47eb86e77ca6bb9bebbe9..7bcc51aef319d6e8b50d0362e629dc6b088018c1 100644 (file)
@@ -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;
        }
 }