fix [#29380] VParent + Mask Mod,
authorCampbell Barton <ideasman42@gmail.com>
Sat, 26 Nov 2011 20:48:18 +0000 (20:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 26 Nov 2011 20:48:18 +0000 (20:48 +0000)
    line was out of sync with trunk

source/blender/blenkernel/intern/object.c

index 5f689aafaca702e49dd4024b8a08f171702ccf65..ffa2a36dcf621f9715601e90b05c815c5adcdf7b 100644 (file)
@@ -2564,11 +2564,12 @@ void object_handle_update(Scene *scene, Object *ob)
 
 #else                          /* ensure CD_MASK_BAREMESH for now */
                                        BMEditMesh *em = (ob == scene->obedit)? ((Mesh*)ob->data)->edit_btmesh : NULL;
+                                       unsigned int data_mask= scene->customdata_mask | ob->customdata_mask | CD_MASK_BAREMESH;
                                        if(em) {
-                                               makeDerivedMesh(scene, ob, em,  scene->customdata_mask | CD_MASK_BAREMESH, 0); /* was CD_MASK_BAREMESH */
+                                               makeDerivedMesh(scene, ob, em,  data_mask, 0); /* was CD_MASK_BAREMESH */
                                        }
                                        else {
-                                               makeDerivedMesh(scene, ob, NULL, scene->customdata_mask | CD_MASK_BAREMESH, 0);
+                                               makeDerivedMesh(scene, ob, NULL, data_mask, 0);
                                        }
 #endif