[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56736] trunk/blender/source/blender: add missing STACK_INIT, also quiet float <> double conversion warnings.
Campbell Barton
ideasman42 at gmail.com
Mon May 13 04:11:03 CEST 2013
Revision: 56736
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56736
Author: campbellbarton
Date: 2013-05-13 02:10:59 +0000 (Mon, 13 May 2013)
Log Message:
-----------
add missing STACK_INIT, also quiet float <> double conversion warnings.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2013-05-13 02:01:35 UTC (rev 56735)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2013-05-13 02:10:59 UTC (rev 56736)
@@ -388,17 +388,17 @@
/* 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. */
Modified: trunk/blender/source/blender/bmesh/operators/bmo_utils.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_utils.c 2013-05-13 02:01:35 UTC (rev 56735)
+++ trunk/blender/source/blender/bmesh/operators/bmo_utils.c 2013-05-13 02:10:59 UTC (rev 56736)
@@ -359,6 +359,7 @@
* 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);
More information about the Bf-blender-cvs
mailing list