Cleanup: double promotion

4 files changed, 16 insertions, 15 deletions

diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index c3d95d700a0..1050594318f 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -84,10 +84,11 @@ void DRW_globals_update(void)
 	/* Grid */
 	UI_GetThemeColorShade4fv(TH_GRID, 10, ts.colorGrid);
 	/* emphasise division lines lighter instead of darker, if background is darker than grid */
-	UI_GetThemeColorShade4fv(TH_GRID,
-		(ts.colorGrid[0] + ts.colorGrid[1] + ts.colorGrid[2] + 0.12 >
-		ts.colorBackground[0] + ts.colorBackground[1] + ts.colorBackground[2])
-		? 20 : -10, ts.colorGridEmphasise);
+	UI_GetThemeColorShade4fv(
+	        TH_GRID,
+	        (ts.colorGrid[0] + ts.colorGrid[1] + ts.colorGrid[2] + 0.12f >
+	         ts.colorBackground[0] + ts.colorBackground[1] + ts.colorBackground[2]) ?
+	        20 : -10, ts.colorGridEmphasise);
 	/* Grid Axis */
 	UI_GetThemeColorBlendShade4fv(TH_GRID, TH_AXIS_X, 0.5f, -10, ts.colorGridAxisX);
 	UI_GetThemeColorBlendShade4fv(TH_GRID, TH_AXIS_Y, 0.5f, -10, ts.colorGridAxisY);
@@ -102,10 +103,10 @@ void DRW_globals_update(void)
 	ts.sizeLampCircleShadow = ts.sizeLampCircle + U.pixelsize * 3.0f;
 
 	/* M_SQRT2 to be at least the same size of the old square */
-	ts.sizeVertex = ceil(UI_GetThemeValuef(TH_VERTEX_SIZE) * M_SQRT2 / 2.0f);
-	ts.sizeFaceDot = ceil(UI_GetThemeValuef(TH_FACEDOT_SIZE) * M_SQRT2);
+	ts.sizeVertex = ceilf(UI_GetThemeValuef(TH_VERTEX_SIZE) * (float)M_SQRT2 / 2.0f);
+	ts.sizeFaceDot = ceilf(UI_GetThemeValuef(TH_FACEDOT_SIZE) * (float)M_SQRT2);
 	ts.sizeEdge = 1.0f / 2.0f; /* TODO Theme */
-	ts.sizeEdgeFix = 0.5f + 2.0f * (2.0f * (MAX2(ts.sizeVertex, ts.sizeEdge)) * M_SQRT1_2);
+	ts.sizeEdgeFix = 0.5f + 2.0f * (2.0f * (MAX2(ts.sizeVertex, ts.sizeEdge)) * (float)M_SQRT1_2);
 
 	/* TODO Waiting for notifiers to invalidate cache */
 	if (globals_ubo) {
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index ce4390c40fb..d98be8b7835 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -101,7 +101,7 @@
 #ifdef USE_PROFILE
 #include "PIL_time.h"
 
-#define PROFILE_TIMER_FALLOFF 0.1f
+#define PROFILE_TIMER_FALLOFF 0.1
 
 #define PROFILE_START(time_start) \
 	double time_start = PIL_check_seconds_timer();
@@ -113,7 +113,7 @@
 /* exp average */
 #define PROFILE_END_UPDATE(time_update, time_start) { \
 	double _time_delta = (PIL_check_seconds_timer() - time_start) * 1e3; \
-	time_update = (time_update * (1.0f - PROFILE_TIMER_FALLOFF)) + \
+	time_update = (time_update * (1.0 - PROFILE_TIMER_FALLOFF)) + \
 	              (_time_delta * PROFILE_TIMER_FALLOFF); \
 } ((void)0)
 
@@ -3081,15 +3081,15 @@ static void DRW_debug_gpu_stats(void)
 
 	sprintf(stat_string, "GPU Memory");
 	draw_stat(&rect, 0, v, stat_string, sizeof(stat_string));
-	sprintf(stat_string, "%.2fMB", (float)(tex_mem + vbo_mem) / 1000000.0);
+	sprintf(stat_string, "%.2fMB", (double)(tex_mem + vbo_mem) / 1000000.0);
 	draw_stat(&rect, 1, v++, stat_string, sizeof(stat_string));
 	sprintf(stat_string, "   |--> Textures");
 	draw_stat(&rect, 0, v, stat_string, sizeof(stat_string));
-	sprintf(stat_string, "%.2fMB", (float)tex_mem / 1000000.0);
+	sprintf(stat_string, "%.2fMB", (double)tex_mem / 1000000.0);
 	draw_stat(&rect, 1, v++, stat_string, sizeof(stat_string));
 	sprintf(stat_string, "   |--> Meshes");
 	draw_stat(&rect, 0, v, stat_string, sizeof(stat_string));
-	sprintf(stat_string, "%.2fMB", (float)vbo_mem / 1000000.0);
+	sprintf(stat_string, "%.2fMB", (double)vbo_mem / 1000000.0);
 	draw_stat(&rect, 1, v++, stat_string, sizeof(stat_string));
 
 	/* Pre offset for stats_draw */
diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c
index 37c44f33915..e58f7cfbd29 100644
--- a/source/blender/draw/intern/draw_view.c
+++ b/source/blender/draw/intern/draw_view.c
@@ -680,7 +680,7 @@ void DRW_draw_cursor(void)
 		immAttrib3fv(wpos, co);
 
 		for (int i = 0; i < segments; ++i) {
-			float angle = 2 * M_PI * ((float)i / (float)segments);
+			float angle = (float)(2 * M_PI) * ((float)i / (float)segments);
 			float x = f10 * cosf(angle);
 			float y = f10 * sinf(angle);
 
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 70ee0dbc48b..8176fbcda5c 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -496,7 +496,7 @@ static void OBJECT_engine_init(void *vedata)
 		e_data.grid_settings[1] = grid_res; /* gridResolution */
 		e_data.grid_settings[2] = grid_scale; /* gridScale */
 		e_data.grid_settings[3] = v3d->gridsubdiv; /* gridSubdiv */
-		e_data.grid_settings[4] = (v3d->gridsubdiv > 1) ? 1.0f / log(v3d->gridsubdiv) : 0.0; /* 1/log(gridSubdiv) */
+		e_data.grid_settings[4] = (v3d->gridsubdiv > 1) ? 1.0f / logf(v3d->gridsubdiv) : 0.0f; /* 1/log(gridSubdiv) */
 	}
 }
 
@@ -1147,7 +1147,7 @@ static void DRW_shgroup_lamp(OBJECT_StorageList *stl, Object *ob, SceneLayer *sl
 		size[0] = size[1] = blend; size[2] = 1.0f;
 		size_to_mat4(sizemat, size);
 		translate_m4(sizemat, 0.0f, 0.0f, -1.0f);
-		rotate_m4(sizemat, 'X', M_PI / 2.0f);
+		rotate_m4(sizemat, 'X', (float)(M_PI / 2));
 		mul_m4_m4m4(spotblendmat, shapemat, sizemat);
 
 		if (la->mode & LA_SQUARE) {