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 | |
parent | 54836956984b65ef75443475ca78d79e54647ca2 (diff) |
Cleanup: remove unused scene arg
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object_api.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/pointdensity.c | 8 |
6 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index ed453754648..7ea27fd8094 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -302,7 +302,7 @@ void psys_free_path_cache(struct ParticleSystem *psys, struct PTCacheEdit *edit) void psys_free(struct Object *ob, struct ParticleSystem *psys); void psys_render_set(struct Object *ob, struct ParticleSystem *psys, float viewmat[4][4], float winmat[4][4], int winx, int winy, int timeoffset); -void psys_render_restore(struct Scene *scene, struct Object *ob, struct ParticleSystem *psys); +void psys_render_restore(struct Object *ob, struct ParticleSystem *psys); bool psys_render_simplify_params(struct ParticleSystem *psys, struct ChildParticle *cpa, float *params); void psys_interpolate_uvs(const struct MTFace *tface, int quad, const float w[4], float uvco[2]); diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 1fedf38ff47..03c99b7ad45 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -651,7 +651,7 @@ void psys_render_set(Object *ob, ParticleSystem *psys, float viewmat[4][4], floa psys->recalc |= PSYS_RECALC_RESET; } -void psys_render_restore(Scene *scene, Object *ob, ParticleSystem *psys) +void psys_render_restore(Object *ob, ParticleSystem *psys) { ParticleRenderData *data; ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys); diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index ae8b3799bac..5645f018cad 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -167,7 +167,7 @@ static void dupli_render_particle_set(Scene *scene, Object *ob, int level, int e if (enable) psys_render_set(ob, psys, mat, mat, 1, 1, 0.f); else - psys_render_restore(scene, ob, psys); + psys_render_restore(ob, psys); } } diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 94b33916cf4..f779d67e1f4 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -592,7 +592,7 @@ static void rna_ParticleSystem_set_resolution(ParticleSystem *particlesystem, Sc ParticleSystemModifierData *psmd = psys_get_modifier(object, particlesystem); if (particlesystem->renderdata) { - psys_render_restore(scene, object, particlesystem); + psys_render_restore(object, particlesystem); } psmd->flag &= ~eParticleSystemFlag_psys_updated; 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); } } |