[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38807] branches/bmesh/blender/source/ blender/blenkernel/intern/multires.c: fix for last merge

[Campbell Barton]

Revision: 38807
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38807
Author:   campbellbarton
Date:     2011-07-29 02:15:01 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
fix for last merge

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/multires.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/multires.c	2011-07-29 02:03:53 UTC (rev 38806)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/multires.c	2011-07-29 02:15:01 UTC (rev 38807)
@@ -482,7 +482,7 @@
 	if(optimal)
 		smd.flags |= eSubsurfModifierFlag_ControlEdges;
 
-		return subsurf_make_derived_from_derived(dm, &smd, 0, NULL, 0, 0, (ob->mode & OB_MODE_EDIT));
+	return subsurf_make_derived_from_derived(dm, &smd, 0, NULL, 0, 0, (ob->mode & OB_MODE_EDIT));
 }
 
 
@@ -941,7 +941,7 @@
 	ccgdm = multires_dm_create_local(ob, dm, totlvl, totlvl, mmd->simple);
 	
 	subsurf = subsurf_dm_create_local(ob, dm, totlvl,
-		mmd->simple, mmd->flags & eMultiresModifierFlag_ControlEdges);
+		mmd->simple, mmd->flags & eMultiresModifierFlag_ControlEdges, mmd->flags & eMultiresModifierFlag_PlainUv);
 
 	numGrids = subsurf->getNumGrids(subsurf);
 	gridSize = subsurf->getGridSize(subsurf);