diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-28 21:08:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-28 21:08:33 +0400 |
| commit | 9b9c4184c88c49ff96f3f23cbfbd00f6811d7301 (patch) | |
| tree | 4c5aaf763f28710d07b3ec364088a98de8ae9794 /source/blender/editors/space_info | |
| parent | faf07c3e2b6cb180d1580b4160ff6534b4754b76 (diff) | |
misc nodes & editors: floats were being implicitly promoted to doubles, adjust to use floats.
+ minor update to demo_mode
Diffstat (limited to 'source/blender/editors/space_info')
| -rw-r--r-- | source/blender/editors/space_info/info_ops.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index 701b0fc1de7..d58fb7b11f0 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -322,11 +322,11 @@ void FILE_OT_find_missing_files(wmOperatorType *ot) * inactive regions, so use this for now. --matt */ -#define INFO_TIMEOUT 5.0 -#define INFO_COLOR_TIMEOUT 3.0 -#define ERROR_TIMEOUT 10.0 -#define ERROR_COLOR_TIMEOUT 6.0 -#define COLLAPSE_TIMEOUT 0.25 +#define INFO_TIMEOUT 5.0f +#define INFO_COLOR_TIMEOUT 3.0f +#define ERROR_TIMEOUT 10.0f +#define ERROR_COLOR_TIMEOUT 6.0f +#define COLLAPSE_TIMEOUT 0.25f static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *event) { wmWindowManager *wm= CTX_wm_manager(C); @@ -353,7 +353,7 @@ static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), wm color_timeout = (report->type & RPT_ERROR_ALL)?ERROR_COLOR_TIMEOUT:INFO_COLOR_TIMEOUT; /* clear the report display after timeout */ - if (reports->reporttimer->duration > timeout) { + if ((float)reports->reporttimer->duration > timeout) { WM_event_remove_timer(wm, NULL, reports->reporttimer); reports->reporttimer = NULL; @@ -381,8 +381,8 @@ static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), wm rti->widthfac=1.0; } - progress = reports->reporttimer->duration / timeout; - color_progress = reports->reporttimer->duration / color_timeout; + progress = (float)reports->reporttimer->duration / timeout; + color_progress = (float)reports->reporttimer->duration / color_timeout; /* save us from too many draws */ if(color_progress <= 1.0f) { |