diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2013-01-06 22:02:47 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2013-01-06 22:02:47 +0400 |
| commit | e8d599eefe91051c668c864e5a42db02126ea95b (patch) | |
| tree | 3d5074853f40b510567b7a408e19732d28ba7bd0 /source/blender/editors/sculpt_paint | |
| parent | 9f99c7b4e2215c28781751b5e34acd54ae875431 (diff) | |
Disable multires in sculpt mode if dynamic-topology mode is enabled
sculpt_multires_active() now returns NULL if dynamic topology is
enabled. Fixes bug #33718:
projects.blender.org/tracker/?func=detail&aid=33718&group_id=9&atid=498
Diffstat (limited to 'source/blender/editors/sculpt_paint')
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 54ae2ebf588..f9c874ea073 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -137,6 +137,11 @@ MultiresModifierData *sculpt_multires_active(Scene *scene, Object *ob) Mesh *me = (Mesh *)ob->data; ModifierData *md; + if (ob->sculpt->bm) { + /* can't combine multires and dynamic topology */ + return NULL; + } + if (!CustomData_get_layer(&me->ldata, CD_MDISPS)) { /* multires can't work without displacement layer */ return NULL; |