From c961c56c64eac7b7b8aaea771bbc1d58ca182d6e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 May 2013 02:10:59 +0000 Subject: [PATCH] add missing STACK_INIT, also quiet float <> double conversion warnings. --- source/blender/blenkernel/intern/tracking.c | 12 ++++++------ source/blender/bmesh/operators/bmo_utils.c | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 17fc696b771..7ad74085f85 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -388,17 +388,17 @@ static void get_marker_coords_for_tracking(int frame_width, int frame_height, /* Convert the corners into search space coordinates. */ for (i = 0; i < 4; i++) { marker_unified_to_search_pixel(frame_width, frame_height, marker, marker->pattern_corners[i], pixel_coords); - search_pixel_x[i] = pixel_coords[0] - 0.5; - search_pixel_y[i] = pixel_coords[1] - 0.5; + search_pixel_x[i] = pixel_coords[0] - 0.5f; + search_pixel_y[i] = pixel_coords[1] - 0.5f; } /* Convert the center position (aka "pos"); this is the origin */ - unified_coords[0] = 0.0; - unified_coords[1] = 0.0; + unified_coords[0] = 0.0f; + unified_coords[1] = 0.0f; marker_unified_to_search_pixel(frame_width, frame_height, marker, unified_coords, pixel_coords); - search_pixel_x[4] = pixel_coords[0] - 0.5; - search_pixel_y[4] = pixel_coords[1] - 0.5; + search_pixel_x[4] = pixel_coords[0] - 0.5f; + search_pixel_y[4] = pixel_coords[1] - 0.5f; } /* Inverse of above. */ diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c index fe71ea534c5..2a8c8c8e2cd 100644 --- a/source/blender/bmesh/operators/bmo_utils.c +++ b/source/blender/bmesh/operators/bmo_utils.c @@ -359,6 +359,7 @@ void bmo_recalc_face_normals_exec(BMesh *bm, BMOperator *op) * stack (if we use simple function recursion, we'd end up overloading * the stack on large meshes). */ + STACK_INIT(fstack); STACK_PUSH(fstack, startf); BMO_elem_flag_enable(bm, startf, FACE_VIS);