svn merge ^/trunk/blender -r40491:40498
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 13:55:06 +0000 (13:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 13:55:06 +0000 (13:55 +0000)
1  2 
source/blender/blenkernel/intern/DerivedMesh.c

index 5f264c02de2e8d1c7fd05d99fc9f17757a026add,fddd2809c47735d06a0fd94798b115f38d32b394..9d140daada9162286cafb0dabaabb350743cf229
@@@ -1291,8 -1980,6 +1291,8 @@@ static void mesh_calc_modifiers(Scene *
                                 * data by using generic DM_copy_vert_data() functions.
                                 */
                                if(needMapping || (nextmask & CD_MASK_ORIGINDEX)) {
-                                       int i, *orig;
++                                      int i;
 +                                      
                                        /* calc */
                                        DM_add_vert_layer(dm, CD_ORIGINDEX, CD_CALLOC, NULL);
                                        DM_add_edge_layer(dm, CD_ORIGINDEX, CD_CALLOC, NULL);