diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-13 06:10:59 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-13 06:10:59 +0400 |
commit | c961c56c64eac7b7b8aaea771bbc1d58ca182d6e (patch) | |
tree | 9c8c02776c4390a103514f9af70dcf4cc504aee4 /source | |
parent | 210762059354c5abcc0fe92d2c729fb85f46f1b6 (diff) |
add missing STACK_INIT, also quiet float <> double conversion warnings.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 12 | ||||
-rw-r--r-- | 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); |