[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34062] trunk/blender/source/blender/ blenkernel/intern/object.c: comment assert and ensure meshes are always calculated with CD_MASK_BAREMESH , scene-> customdata_mask should be corrected in background mode but for now this is ok .

[Campbell Barton]

Revision: 34062
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34062
Author:   campbellbarton
Date:     2011-01-04 13:31:42 +0100 (Tue, 04 Jan 2011)

Log Message:
-----------
comment assert and ensure meshes are always calculated with CD_MASK_BAREMESH, scene->customdata_mask should be corrected in background mode but for now this is ok.

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

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2011-01-04 10:37:22 UTC (rev 34061)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2011-01-04 12:31:42 UTC (rev 34062)
@@ -2549,6 +2549,7 @@
 			switch(ob->type) {
 			case OB_MESH:
 				{
+#if 0				// XXX, comment for 2.56a release, background wont set 'scene->customdata_mask'
 					EditMesh *em = (ob == scene->obedit)? BKE_mesh_get_editmesh(ob->data): NULL;
 					BKE_assert((scene->customdata_mask & CD_MASK_BAREMESH) == CD_MASK_BAREMESH);
 					if(em) {
@@ -2556,6 +2557,16 @@
 						BKE_mesh_end_editmesh(ob->data, em);
 					} else
 						makeDerivedMesh(scene, ob, NULL, scene->customdata_mask);
+
+#else				/* ensure CD_MASK_BAREMESH for now */
+					EditMesh *em = (ob == scene->obedit)? BKE_mesh_get_editmesh(ob->data): NULL;
+					if(em) {
+						makeDerivedMesh(scene, ob, em,  scene->customdata_mask | CD_MASK_BAREMESH); /* was CD_MASK_BAREMESH */
+						BKE_mesh_end_editmesh(ob->data, em);
+					} else
+						makeDerivedMesh(scene, ob, NULL, scene->customdata_mask | CD_MASK_BAREMESH);
+#endif
+
 				}
 				break;