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>2016-02-10 05:59:57 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-02-10 07:27:28 +0300
commit2cbf32e0fb471c23a81785707200296a049b3017 (patch)
treed7f1fa0ccf7b4af10bb153e6a954a86230ec0527 /source/blender/render
parent184a2ee5a4a79540656a545f65f7bdbe3803d1cd (diff)
Cleanup: double promotion
Also remove null checks from args with non-null attribute.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/pipeline.c4
1 files changed, 3 insertions, 1 deletions
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);