Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-07-25 06:26:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-07-25 06:26:20 +0300
commite301cf3ec2cb8caa544032238cf7a1e7bb5e2523 (patch)
tree8f564a932b1e739eeadd395f69499bf548ed7dfe /source/blender/windowmanager
parent2a286829f7fa19ffceb6ec6be095ee11305353e3 (diff)
Cleanup: double-promotion warnings
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 514fafca71f..cab9b02d830 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -4486,7 +4486,7 @@ static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *even
break;
case PROP_PERCENTAGE:
new_value = ((dist - WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE) / WM_RADIAL_CONTROL_DISPLAY_WIDTH) * 100.0f;
- if (snap) new_value = ((int)(new_value + 2.5)) / 5 * 5;
+ if (snap) new_value = ((int)(new_value + 2.5f)) / 5 * 5;
break;
case PROP_FACTOR:
new_value = (WM_RADIAL_CONTROL_DISPLAY_SIZE - dist) / WM_RADIAL_CONTROL_DISPLAY_WIDTH;
@@ -4734,7 +4734,7 @@ static int redraw_timer_exec(bContext *C, wmOperator *op)
redraw_timer_step(C, bmain, scene, win, sa, ar, type, cfra);
iter_steps += 1;
- if (time_limit != 0.0f) {
+ if (time_limit != 0.0) {
if ((PIL_check_seconds_timer() - time_start) > time_limit) {
break;
}