diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-01-07 12:10:57 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-01-07 12:11:59 +0300 |
commit | 0778856268a77a323970ad5f3e2374664f592b0b (patch) | |
tree | 30e3ac9d6134ac33b36328e78039215a90a4b0e0 /source/blender/render | |
parent | 54836956984b65ef75443475ca78d79e54647ca2 (diff) |
Cleanup: remove unused scene arg
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/pointdensity.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 69e45fea74d..1cd8e25b1aa 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4688,7 +4688,7 @@ static void add_render_object(Render *re, Object *ob, Object *par, DupliObject * psys->flag |= PSYS_USE_IMAT; init_render_object_data(re, obr, timeoffset); if (!(re->r.scemode & R_VIEWPORT_PREVIEW)) - psys_render_restore(re->scene, ob, psys); + psys_render_restore(ob, psys); psys->flag &= ~PSYS_USE_IMAT; /* only add instance for objects that have not been used for dupli */ @@ -4888,7 +4888,7 @@ static void dupli_render_particle_set(Render *re, Object *ob, int timeoffset, in if (enable) psys_render_set(ob, psys, re->viewmat, re->winmat, re->winx, re->winy, timeoffset); else - psys_render_restore(re->scene, ob, psys); + psys_render_restore(ob, psys); } } diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index 756801a82e8..b4dfbc4a59f 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -156,8 +156,8 @@ static void pointdensity_cache_psys(Scene *scene, CD_MASK_BAREMESH | CD_MASK_MTFACE | CD_MASK_MCOL); } - if ( !psys_check_enabled(ob, psys)) { - psys_render_restore(scene, ob, psys); + if (!psys_check_enabled(ob, psys)) { + psys_render_restore(ob, psys); return; } @@ -253,7 +253,7 @@ static void pointdensity_cache_psys(Scene *scene, } if (use_render_params) { - psys_render_restore(scene, ob, psys); + psys_render_restore(ob, psys); } } @@ -711,7 +711,7 @@ static void particle_system_minmax(Scene *scene, } if (use_render_params) { - psys_render_restore(scene, object, psys); + psys_render_restore(object, psys); } } |