[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61057] trunk/blender/source/blender: code cleanup: warnings

[Campbell Barton]

Revision: 61057
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61057
Author:   campbellbarton
Date:     2013-11-02 04:04:30 +0000 (Sat, 02 Nov 2013)
Log Message:
-----------
code cleanup: warnings

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/smoke.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2013-11-02 00:09:26 UTC (rev 61056)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2013-11-02 04:04:30 UTC (rev 61057)
@@ -276,21 +276,21 @@
 	/* define grid resolutions from longest domain side */
 	if (size[0] >= MAX2(size[1], size[2])) {
 		scale = res / size[0];
-		sds->scale = size[0] / fabs(ob->size[0]);
+		sds->scale = size[0] / fabsf(ob->size[0]);
 		sds->base_res[0] = res;
 		sds->base_res[1] = (int)(size[1] * scale + 0.5f);
 		sds->base_res[2] = (int)(size[2] * scale + 0.5f);
 	}
 	else if (size[1] >= MAX2(size[0], size[2])) {
 		scale = res / size[1];
-		sds->scale = size[1] / fabs(ob->size[1]);
+		sds->scale = size[1] / fabsf(ob->size[1]);
 		sds->base_res[0] = (int)(size[0] * scale + 0.5f);
 		sds->base_res[1] = res;
 		sds->base_res[2] = (int)(size[2] * scale + 0.5f);
 	}
 	else {
 		scale = res / size[2];
-		sds->scale = size[2] / fabs(ob->size[2]);
+		sds->scale = size[2] / fabsf(ob->size[2]);
 		sds->base_res[0] = (int)(size[0] * scale + 0.5f);
 		sds->base_res[1] = (int)(size[1] * scale + 0.5f);
 		sds->base_res[2] = res;
@@ -1338,7 +1338,7 @@
 			float hr = 1.0f / ((float)hires_multiplier);
 			/* slightly adjust high res antialias smoothness based on number of divisions
 			 * to allow smaller details but yet not differing too much from the low res size */
-			float hr_smooth = smooth * pow(hr, 1.0f/3.0f);
+			const float hr_smooth = smooth * powf(hr, 1.0f / 3.0f);
 
 			/* setup loop bounds */
 			for (i = 0; i < 3; i++) {

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2013-11-02 00:09:26 UTC (rev 61056)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2013-11-02 04:04:30 UTC (rev 61057)
@@ -1149,7 +1149,7 @@
 	kmi = WM_keymap_add_item(keymap, "PAINT_OT_mask_flood_fill", IKEY, KM_PRESS, KM_CTRL, 0);
 	RNA_enum_set(kmi->ptr, "mode", PAINT_MASK_INVERT);
 
-	kmi = WM_keymap_add_item(keymap, "PAINT_OT_mask_lasso_gesture", LEFTMOUSE, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "PAINT_OT_mask_lasso_gesture", LEFTMOUSE, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
 
 	/* Toggle dynamic topology */
 	WM_keymap_add_item(keymap, "SCULPT_OT_dynamic_topology_toggle", DKEY, KM_PRESS, KM_CTRL, 0);