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/editors | |
| 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/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 59cb2229905..6ddecd169d9 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1356,8 +1356,7 @@ static uiLayout *draw_modifier( UI_block_emboss_set(block, UI_EMBOSS); /* modifier name */ - md->scene = scene; - if (mti->isDisabled && mti->isDisabled(md, 0)) { + if (mti->isDisabled && mti->isDisabled(scene, md, 0)) { uiLayoutSetRedAlert(row, true); } uiItemR(row, &ptr, "name", 0, "", ICON_NONE); diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index d81958a0815..69c71688406 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -529,7 +529,7 @@ static int modifier_apply_shape( md->scene = scene; - if (mti->isDisabled && mti->isDisabled(md, 0)) { + if (mti->isDisabled && mti->isDisabled(scene, md, 0)) { BKE_report(reports, RPT_ERROR, "Modifier is disabled, skipping apply"); return 0; } @@ -589,7 +589,7 @@ static int modifier_apply_obdata(ReportList *reports, Depsgraph *depsgraph, Scen md->scene = scene; - if (mti->isDisabled && mti->isDisabled(md, 0)) { + if (mti->isDisabled && mti->isDisabled(scene, md, 0)) { BKE_report(reports, RPT_ERROR, "Modifier is disabled, skipping apply"); return 0; } |