[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42178] branches/bmesh/blender/source/ blender/blenkernel/intern/object.c: fix [#29380] VParent + Mask Mod,

[Campbell Barton]

Revision: 42178
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42178
Author:   campbellbarton
Date:     2011-11-26 20:48:18 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
fix [#29380] VParent + Mask Mod,
    line was out of sync with trunk

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

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/object.c	2011-11-26 18:33:31 UTC (rev 42177)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/object.c	2011-11-26 20:48:18 UTC (rev 42178)
@@ -2564,11 +2564,12 @@
 
 #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