[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54899] trunk/blender/source/blender/ editors/mesh/meshtools.c: fix for own regression - joining meshes didn' t merge customdata flags (could loose crease/bevel weights).

[Campbell Barton]

Revision: 54899
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54899
Author:   campbellbarton
Date:     2013-02-27 05:38:48 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
fix for own regression - joining meshes didn't merge customdata flags (could loose crease/bevel weights).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/meshtools.c

Modified: trunk/blender/source/blender/editors/mesh/meshtools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/meshtools.c	2013-02-27 04:59:39 UTC (rev 54898)
+++ trunk/blender/source/blender/editors/mesh/meshtools.c	2013-02-27 05:38:48 UTC (rev 54899)
@@ -149,7 +149,7 @@
 		return OPERATOR_CANCELLED;
 	}
 
-	/* remove tessface to ensure we don't old references to invalid faces */
+	/* remove tessface to ensure we don't hold references to invalid faces */
 	BKE_mesh_tessface_clear(me);
 
 	/* new material indices and material array */
@@ -309,6 +309,10 @@
 			me = base->object->data;
 			
 			if (me->totvert) {
+
+				/* merge customdata flag */
+				((Mesh *)ob->data)->cd_flag |= me->cd_flag;
+
 				/* standard data */
 				CustomData_merge(&me->vdata, &vdata, CD_MASK_MESH, CD_DEFAULT, totvert);
 				CustomData_copy_data(&me->vdata, &vdata, 0, vertofs, me->totvert);