Merge with trunk r39000
authorMiika Hamalainen <blender@miikah.org>
Wed, 3 Aug 2011 18:47:20 +0000 (18:47 +0000)
committerMiika Hamalainen <blender@miikah.org>
Wed, 3 Aug 2011 18:47:20 +0000 (18:47 +0000)
1  2 
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blenderplayer/bad_level_call_stubs/stubs.c

index ebf219417062dcad95626a61c44495dd19debec2,62b8830de2007f56f06a2af4e7494afd78dc9bb7..0a96f8d74bec7feae2464394612173a0b1591ef0
@@@ -1883,8 -1883,9 +1883,10 @@@ static void mesh_calc_modifiers(Scene *
                        
                        /* set the DerivedMesh to only copy needed data */
                        mask= (CustomDataMask)GET_INT_FROM_POINTER(curr->link);
-                       DM_set_only_copy(dm, mask);
+                       /* needMapping check here fixes bug [#28112], otherwise its
+                        * possible that it wont be copied */
 +                      mask |= append_mask;
+                       DM_set_only_copy(dm, mask | (needMapping ? CD_MASK_ORIGINDEX : 0));
                        
                        /* add cloth rest shape key if need */
                        if(mask & CD_MASK_CLOTH_ORCO)