[Bf-blender-cvs] [5eae52a] pie-menus: Quiet double promotion warnings

[Campbell Barton]

Commit: 5eae52ae96cfd0fa5ff39f5f43c77c6156472cc4
Author: Campbell Barton
Date:   Wed Jul 30 23:54:42 2014 +1000
Branches: pie-menus
https://developer.blender.org/rB5eae52ae96cfd0fa5ff39f5f43c77c6156472cc4

Quiet double promotion warnings

===================================================================

M	source/blender/editors/interface/interface_handlers.c
M	source/blender/editors/interface/interface_intern.h
M	source/blender/editors/interface/interface_layout.c
M	source/blender/editors/interface/interface_regions.c
M	source/blender/editors/interface/interface_widgets.c
M	source/blender/windowmanager/intern/wm_operators.c

===================================================================

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 6947548..be2eb90 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6412,14 +6412,14 @@ static void ui_but_pie_visual_dir(RadialDirection dir, float vec[2]) {
 			break;
 	}
 
-	angle = angle / 180.0f * M_PI;
-	vec[0] = cos(angle);
-	vec[1] = sin(angle);
+	angle = DEG2RADF(angle);
+	vec[0] = cosf(angle);
+	vec[1] = sinf(angle);
 }
 
 static bool ui_but_isect_pie_seg(uiBlock *block, uiBut *but)
 {
-	float angle_range = (block->pie_data.flags & UI_PIE_DEGREES_RANGE_LARGE) ? M_PI_4 : M_PI_4 / 2.0f;
+	const float angle_range = (block->pie_data.flags & UI_PIE_DEGREES_RANGE_LARGE) ? M_PI_4 : M_PI_4 / 2.0;
 	float angle_pie;
 	float vec[2];
 
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 5878bca..6b101aa 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -169,7 +169,7 @@ extern const char ui_radial_dir_to_num[8];
 #define UI_PIE_CLICK_STYLE         (1 << 5) /* pie menu changed to click style, click to confirm  */
 #define UI_PIE_ANIMATION_FINISHED  (1 << 6) /* pie animation finished, do not calculate any more motio  */
 
-#define PIE_CLICK_THRESHOLD 50.0
+#define PIE_CLICK_THRESHOLD 50.0f
 
 typedef struct uiLinkLine {  /* only for draw/edit */
 	struct uiLinkLine *next, *prev;
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 3c8971d..895211a 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2250,9 +2250,9 @@ static void ui_litem_layout_radial(uiLayout *litem)
 
 				bitem->but->pie_dir = dir;
 				/* scale the buttons */
-				bitem->but->rect.ymax *= 1.5;
+				bitem->but->rect.ymax *= 1.5f;
 				/* add a little bit more here to include number */
-				bitem->but->rect.xmax += 1.5 * UI_UNIT_X;
+				bitem->but->rect.xmax += 1.5f * UI_UNIT_X;
 				/* enable drawing as pie item if supported by widget */
 				if (ui_item_is_radial_drawable(bitem))
 					bitem->but->dt = UI_EMBOSSR;
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 75c2a4c..00f7b7a 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1719,12 +1719,12 @@ uiBlock *ui_popup_block_refresh(
 		copy_v2_v2(block->pie_data.pie_center_init, block->pie_data.pie_center_spawned);
 
 		/* only try translation if area is large enough */
-		if (BLI_rctf_size_x(&block->rect) < winx - 2.0 * win_width) {
+		if (BLI_rctf_size_x(&block->rect) < winx - (2.0f * win_width)) {
 			if (block->rect.xmin < win_width )   x_offset += win_width - block->rect.xmin;
 			if (block->rect.xmax > winx - win_width) x_offset += winx - win_width - block->rect.xmax;
 		}
 
-		if (BLI_rctf_size_y(&block->rect) < winy - 2.0 * win_width) {
+		if (BLI_rctf_size_y(&block->rect) < winy - (2.0f * win_width)) {
 			if (block->rect.ymin < win_width )   y_offset += win_width - block->rect.ymin;
 			if (block->rect.ymax > winy - win_width) y_offset += winy - win_width - block->rect.ymax;
 		}
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 156b4f9..1ac36fe 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -3810,11 +3810,11 @@ void ui_draw_pie_center(uiBlock *block)
 	if (btheme->tui.wcol_pie_menu.shaded) {
 		char col1[4], col2[4];
 		shadecolors4(col1, col2, btheme->tui.wcol_pie_menu.inner, btheme->tui.wcol_pie_menu.shadetop, btheme->tui.wcol_pie_menu.shadedown);
-		draw_disk_shaded(0.0f, (float)(M_PI * 2.0f), pie_radius_internal, pie_radius_external, subd, col1, col2, true);
+		draw_disk_shaded(0.0f, (float)(M_PI * 2.0), pie_radius_internal, pie_radius_external, subd, col1, col2, true);
 	}
 	else {
 		glColor4ubv((GLubyte *)btheme->tui.wcol_pie_menu.inner);
-		draw_disk_shaded(0.0f, (float)(M_PI * 2.0f), pie_radius_internal, pie_radius_external, subd, NULL, NULL, false);
+		draw_disk_shaded(0.0f, (float)(M_PI * 2.0), pie_radius_internal, pie_radius_external, subd, NULL, NULL, false);
 	}
 
 	if (!(block->pie_data.flags & UI_PIE_INVALID_DIR)) {
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 383c352..fdf3fdd 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2119,7 +2119,7 @@ static int wm_sticky_pie_menu_modal(bContext *C, wmOperator *op, const wmEvent *
 	}
 
 	if (event->type == TIMER) {
-		if (data->timer->duration > U.pie_operator_timeout / 100.0f) {
+		if ((float)data->timer->duration > U.pie_operator_timeout / 100.0f) {
 			StickyOperatorMode mode = RNA_enum_get(op->ptr, "mode");
 
 			switch (mode) {