[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41806] trunk/blender/source/blender/ editors/object/object_bake.c: Fix #29240: multi-res bake broken in 2.60

[Sergey Sharybin]

Revision: 41806
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41806
Author:   nazgul
Date:     2011-11-13 17:45:42 +0000 (Sun, 13 Nov 2011)
Log Message:
-----------
Fix #29240: multi-res bake broken in 2.60

Use preview subdivision level even when in sculpt mode. Makes more sense
than baking against sculpting subdivision level.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_bake.c

Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c	2011-11-13 17:16:04 UTC (rev 41805)
+++ trunk/blender/source/blender/editors/object/object_bake.c	2011-11-13 17:45:42 UTC (rev 41806)
@@ -987,8 +987,7 @@
 	MultiresModifierData *mmd= get_multires_modifier(scene, ob, 0);
 	Mesh *me= (Mesh*)ob->data;
 
-	if(ob->mode==OB_MODE_SCULPT) *lvl= mmd->sculptlvl;
-	else *lvl= mmd->lvl;
+	*lvl= mmd->lvl;
 
 	if(*lvl==0) {
 		DerivedMesh *tmp_dm= CDDM_from_mesh(me, ob);