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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-02-10 05:59:57 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-02-10 07:27:28 +0300
commit2cbf32e0fb471c23a81785707200296a049b3017 (patch)
treed7f1fa0ccf7b4af10bb153e6a954a86230ec0527 /source
parent184a2ee5a4a79540656a545f65f7bdbe3803d1cd (diff)
Cleanup: double promotion
Also remove null checks from args with non-null attribute.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenlib/intern/storage.c1
-rw-r--r--source/blender/blenlib/intern/string.c2
-rw-r--r--source/blender/editors/interface/interface_templates.c2
-rw-r--r--source/blender/render/intern/source/pipeline.c4
4 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
index 260a23c41dc..aba7c9d5ee2 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 efc89ff6a15..aad4649344f 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 a404cde371e..d149c8cb7a4 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 8f5b3150bce..59b9da9b2a6 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);