[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48480] trunk/blender/source/blender/ editors/object/object_bake.c: Fix related on #31984: Multires Displacement Bake creates ripples for each subidived face

[Sergey Sharybin]

Revision: 48480
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48480
Author:   nazgul
Date:     2012-07-02 07:40:25 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
Fix related on #31984: Multires Displacement Bake creates ripples for each subidived face

Skip applying subdivisions in cases when low resolution mesh is disabled
and baking happens from higher level to higher 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	2012-07-02 00:40:42 UTC (rev 48479)
+++ trunk/blender/source/blender/editors/object/object_bake.c	2012-07-02 07:40:25 UTC (rev 48480)
@@ -616,13 +616,15 @@
 
 		CLAMP(ss_lvl, 0, 6);
 
-		smd.levels = smd.renderLevels = ss_lvl;
-		smd.flags |= eSubsurfModifierFlag_SubsurfUv;
+		if (ss_lvl > 0) {
+			smd.levels = smd.renderLevels = ss_lvl;
+			smd.flags |= eSubsurfModifierFlag_SubsurfUv;
 
-		if (bkr->simple)
-			smd.subdivType = ME_SIMPLE_SUBSURF;
+			if (bkr->simple)
+				smd.subdivType = ME_SIMPLE_SUBSURF;
 
-		height_data->ssdm = subsurf_make_derived_from_derived(bkr->lores_dm, &smd, NULL, 0);
+			height_data->ssdm = subsurf_make_derived_from_derived(bkr->lores_dm, &smd, NULL, 0);
+		}
 	}
 
 	height_data->origindex = lodm->getTessFaceDataArray(lodm, CD_ORIGINDEX);