[Bf-blender-cvs] [2cbf32e] master: Cleanup: double promotion
Campbell Barton
noreply at git.blender.org
Wed Feb 10 05:35:07 CET 2016
Commit: 2cbf32e0fb471c23a81785707200296a049b3017
Author: Campbell Barton
Date: Wed Feb 10 13:59:57 2016 +1100
Branches: master
https://developer.blender.org/rB2cbf32e0fb471c23a81785707200296a049b3017
Cleanup: double promotion
Also remove null checks from args with non-null attribute.
===================================================================
M source/blender/blenlib/intern/storage.c
M source/blender/blenlib/intern/string.c
M source/blender/editors/interface/interface_templates.c
M source/blender/render/intern/source/pipeline.c
===================================================================
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
index 260a23c..aba7c9d 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -232,7 +232,6 @@ int BLI_exists(const char *name)
if (res == -1) return(0);
#else
struct stat st;
- BLI_assert(name);
BLI_assert(!BLI_path_is_rel(name));
if (stat(name, &st)) return(0);
#endif
diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index efc89ff..aad4649 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -302,8 +302,6 @@ char *BLI_sprintfN(const char *__restrict format, ...)
va_list arg;
char *n;
- BLI_assert(format != NULL);
-
va_start(arg, format);
ds = BLI_dynstr_new();
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index a404cde..d149c8c 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -3399,7 +3399,7 @@ static char *progress_tooltip_func(bContext *UNUSED(C), void *argN, const char *
BLI_timecode_string_from_time_simple(elapsed_str, sizeof(elapsed_str), elapsed);
if (progress) {
- const double remaining = (elapsed / progress) - elapsed;
+ const double remaining = (elapsed / (double)progress) - elapsed;
BLI_timecode_string_from_time_simple(remaining_str, sizeof(remaining_str), remaining);
}
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 8f5b315..59b9da9 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1506,7 +1506,9 @@ static void do_render_3d(Render *re)
const int cfra_backup = re->scene->r.cfra;
const float subframe_backup = re->scene->r.subframe;
- BKE_scene_frame_set(re->scene, (double)re->scene->r.cfra + re->scene->r.subframe + re->mblur_offs + re->field_offs);
+ BKE_scene_frame_set(
+ re->scene, (double)re->scene->r.cfra + (double)re->scene->r.subframe +
+ (double)re->mblur_offs + (double)re->field_offs);
/* init main render result */
main_render_result_new(re);
More information about the Bf-blender-cvs
mailing list