diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-21 18:54:12 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-21 19:04:05 +0300 |
| commit | 6427141f7bb69b21272b8a97bd5d889ffbac740e (patch) | |
| tree | b9337a236f0621783ffe75dc6640f7696fb3cb91 /source/blender/modifiers/intern/MOD_particleinstance.c | |
| parent | 991d4f1c6b661d9a6b00e073d9a01c8a8a133b12 (diff) | |
Modifiers: Stop using md->scene in isDisabled() callback
This is first commit in series of changes to get rid of md->scene.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_particleinstance.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_particleinstance.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 0aafcf33202..8f099c3187e 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -87,7 +87,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) } -static bool isDisabled(ModifierData *md, int useRenderParams) +static bool isDisabled(const struct Scene *scene, ModifierData *md, int useRenderParams) { ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *)md; ParticleSystem *psys; @@ -112,7 +112,7 @@ static bool isDisabled(ModifierData *md, int useRenderParams) if (useRenderParams) required_mode = eModifierMode_Render; else required_mode = eModifierMode_Realtime; - if (!modifier_isEnabled(md->scene, ob_md, required_mode)) + if (!modifier_isEnabled(scene, ob_md, required_mode)) return true; break; |