archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Modifiers: Stop using md->scene in isDisabled() callback

Browse Source 
This is first commit in series of changes to get rid of md->scene.
This commit is contained in:
Sergey Sharybin
2018-06-21 17:54:12 +02:00
parent 991d4f1c6b
commit 6427141f7b
30 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/modifiers/intern/MOD_particleinstance.c
View File

@@ -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;