diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-07-05 14:35:48 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-07-05 14:35:48 +0400 |
commit | 495ce5c88b124637e3493c9759a7b6348362635a (patch) | |
tree | 27eb9905512c6b6f60d05686d26e0a29c0535ae5 /source/blender/editors/object | |
parent | ef0f475f207b3db1c7cb760180c2702c01f213a3 (diff) |
Fix part of #27858: crash trying to apply subsurf modifier as shape key,
fix found by Bastian Schreiber.
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index fca35683c6f..2ac9161ffa3 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -401,6 +401,8 @@ static int modifier_apply_shape(ReportList *reports, Scene *scene, Object *ob, M { ModifierTypeInfo *mti= modifierType_getInfo(md->type); + md->scene= scene; + if (mti->isDisabled && mti->isDisabled(md, 0)) { BKE_report(reports, RPT_ERROR, "Modifier is disabled, skipping apply"); return 0; @@ -449,6 +451,8 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob, { ModifierTypeInfo *mti= modifierType_getInfo(md->type); + md->scene= scene; + if (mti->isDisabled && mti->isDisabled(md, 0)) { BKE_report(reports, RPT_ERROR, "Modifier is disabled, skipping apply"); return 0; |