diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2013-01-07 00:06:53 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2013-01-07 00:06:53 +0400 |
commit | a4c6e36aac7b7e99786198ce8a7f9ece5239365e (patch) | |
tree | 6223d80c89fcd230cb295941619688a786a86013 /source/blender/editors/sculpt_paint | |
parent | 75f05ebe6278d48ca8503d604f7fc4c805d719a6 (diff) |
Fix for r53610, check that ob->sculpt is valid before using it
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index f9c874ea073..a9ceebc270a 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -137,7 +137,7 @@ MultiresModifierData *sculpt_multires_active(Scene *scene, Object *ob) Mesh *me = (Mesh *)ob->data; ModifierData *md; - if (ob->sculpt->bm) { + if (ob->sculpt && ob->sculpt->bm) { /* can't combine multires and dynamic topology */ return NULL; } |