[Bf-blender-cvs] [d3c4553] master: Fix a couple of harmless compiler warnings.

[Brecht Van Lommel]

Commit: d3c45535529603a90e47343d088df1dec750c81d
Author: Brecht Van Lommel
Date:   Fri May 1 19:17:14 2015 +0200
Branches: master
https://developer.blender.org/rBd3c45535529603a90e47343d088df1dec750c81d

Fix a couple of harmless compiler warnings.

===================================================================

M       source/blender/bmesh/operators/bmo_connect_concave.c
M       source/blender/bmesh/tools/bmesh_intersect.c
M       source/blender/editors/sculpt_paint/paint_image_proj.c
M       source/blender/gpu/intern/gpu_debug.c

===================================================================

diff --git a/source/blender/bmesh/operators/bmo_connect_concave.c 
b/source/blender/bmesh/operators/bmo_connect_concave.c
index a00f65b..107aead 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 76a289f..b11a22b 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 b74dcb7..4085f13 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 a0dde9c..7bcc51a 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;
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs