forked from bartvdbraak/blender
add missing STACK_INIT, also quiet float <> double conversion warnings.
This commit is contained in:
parent
2107620593
commit
c961c56c64
@ -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. */
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user