kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix a couple of harmless compiler warnings.

Browse Source
This commit is contained in:
Brecht Van Lommel 2015-05-01 19:17:14 +02:00
parent 74d31279cd
commit d3c4553552
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/bmesh/operators/bmo_connect_concave.c
View File

@ -79,8 +79,8 @@ static bool bm_face_split_by_concave(
struct Heap *pf_heap, struct EdgeHash *pf_ehash) struct Heap *pf_heap, struct EdgeHash *pf_ehash)
{ {
const int f_base_len = f_base->len; const int f_base_len = f_base->len;
int faces_array_tot = f_base->len - 3; int faces_array_tot = f_base_len - 3;
int edges_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); BMFace **faces_array = BLI_array_alloca(faces_array, faces_array_tot);
BMEdge **edges_array = BLI_array_alloca(edges_array, edges_array_tot); BMEdge **edges_array = BLI_array_alloca(edges_array, edges_array_tot);
const int quad_method = 0, ngon_method = 0; /* beauty */ const int quad_method = 0, ngon_method = 0; /* beauty */

4
source/blender/bmesh/tools/bmesh_intersect.c
View File

@ -1267,10 +1267,8 @@ bool BM_mesh_intersect(
face_edges_split(bm, f, e_ls_base); face_edges_split(bm, f, e_ls_base);
} }
} }
#else
(void)totface_orig;
#endif /* USE_NET */ #endif /* USE_NET */
(void)totface_orig;
#ifdef USE_SEPARATE #ifdef USE_SEPARATE
if (use_separate) { if (use_separate) {

2
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@ -3886,7 +3886,7 @@ static void project_paint_begin(
{ {
ProjPaintLayerClone layer_clone; ProjPaintLayerClone layer_clone;
ProjPaintFaceLookup face_lookup; 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 */ MemArena *arena; /* at the moment this is just ps->arena_mt[0], but use this to show were not multithreading */

1
source/blender/gpu/intern/gpu_debug.c
View 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); GLboolean gl_ok = gpu_report_gl_errors(file, line, str);
BLI_assert(gl_ok); BLI_assert(gl_ok);
(void) gl_ok;
} }
} }