[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53610] trunk/blender/source/blender/ editors/sculpt_paint/sculpt.c: Disable multires in sculpt mode if dynamic-topology mode is enabled

[Nicholas Bishop]

Revision: 53610
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53610
Author:   nicholasbishop
Date:     2013-01-06 18:02:47 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
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

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/sculpt.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2013-01-06 17:06:13 UTC (rev 53609)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2013-01-06 18:02:47 UTC (rev 53610)
@@ -137,6 +137,11 @@
 	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;