[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38439] trunk/blender/source/blender/ editors/object/object_bake.c: Fixed crash of multires baker when baking from sculpt mode.

[Sergey Sharybin]

Revision: 38439
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38439
Author:   nazgul
Date:     2011-07-16 17:55:46 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
Fixed crash of multires baker when baking from sculpt mode.

Incorrect low level was used for this case -- it should be
sculpt level, not preview level.

Thanks to Morten Mikkelsen to point on this bug :)

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-07-16 17:03:01 UTC (rev 38438)
+++ trunk/blender/source/blender/editors/object/object_bake.c	2011-07-16 17:55:46 UTC (rev 38439)
@@ -966,9 +966,10 @@
 	MultiresModifierData *mmd= get_multires_modifier(scene, ob, 0);
 	Mesh *me= (Mesh*)ob->data;
 
-	*lvl= mmd->lvl;
+	if(ob->mode==OB_MODE_SCULPT) *lvl= mmd->sculptlvl;
+	else *lvl= mmd->lvl;
 
-	if(mmd->lvl==0) {
+	if(*lvl==0) {
 		DerivedMesh *tmp_dm= CDDM_from_mesh(me, ob);
 		dm= CDDM_copy(tmp_dm);
 		tmp_dm->release(tmp_dm);
@@ -976,7 +977,7 @@
 		MultiresModifierData tmp_mmd= *mmd;
 		DerivedMesh *cddm= CDDM_from_mesh(me, ob);
 
-		tmp_mmd.lvl= mmd->lvl;
+		tmp_mmd.lvl= *lvl;
 		dm= multires_dm_create_from_derived(&tmp_mmd, 1, cddm, ob, 0, 0);
 		cddm->release(cddm);
 	}