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
This commit is contained in:
Nicholas Bishop 2013-01-06 18:02:47 +00:00
parent 9f99c7b4e2
commit e8d599eefe

@ -137,6 +137,11 @@ MultiresModifierData *sculpt_multires_active(Scene *scene, Object *ob)
Mesh *me = (Mesh *)ob->data; Mesh *me = (Mesh *)ob->data;
ModifierData *md; ModifierData *md;
if (ob->sculpt->bm) {
/* can't combine multires and dynamic topology */
return NULL;
}
if (!CustomData_get_layer(&me->ldata, CD_MDISPS)) { if (!CustomData_get_layer(&me->ldata, CD_MDISPS)) {
/* multires can't work without displacement layer */ /* multires can't work without displacement layer */
return NULL; return NULL;