svn merge -r38718:38804 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jul 2011 02:03:53 +0000 (02:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jul 2011 02:03:53 +0000 (02:03 +0000)
19 files changed:
1  2 
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/multires.c
source/blender/editors/armature/editarmature.c
source/blender/editors/object/object_add.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_snap.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c

index 161f05b6fc991628ebca73721f6cdf421ea90fc9,88a670ecb220d4e9ff701cb13d148d7de7b04498..342c7c92e3a738dce719fd26fb9dd37ea53a4c23
@@@ -906,10 -885,10 +907,10 @@@ static void multiresModifier_update(Der
                        else cddm = CDDM_from_mesh(me, NULL);
                        DM_set_only_copy(cddm, CD_MASK_BAREMESH);
  
-                       subdm = subsurf_dm_create_local(ob, cddm, mmd->totlvl, mmd->simple, 0);
+                       subdm = subsurf_dm_create_local(ob, cddm, mmd->totlvl, mmd->simple, 0, mmd->flags & eMultiresModifierFlag_PlainUv);
                        cddm->release(cddm);
  
 -                      multiresModifier_disp_run(dm, me, 1, 0, subdm->getGridData(subdm), mmd->totlvl);
 +                      multiresModifier_disp_run(dm, me, NULL, 1, 0, subdm->getGridData(subdm), mmd->totlvl);
  
                        subdm->release(subdm);
                }
Simple merge