[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51611] trunk/blender/source/blender/ editors/mesh/meshtools.c: skip updating tessface customdata layers when joining meshes & clear tessface data on the target mesh so stale tessface data isnt used .

Campbell Barton ideasman42 at gmail.com
Thu Oct 25 10:48:11 CEST 2012


Revision: 51611
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51611
Author:   campbellbarton
Date:     2012-10-25 08:48:05 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
skip updating tessface customdata layers when joining meshes & clear tessface data on the target mesh so stale tessface data isnt used.

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	2012-10-25 07:53:11 UTC (rev 51610)
+++ trunk/blender/source/blender/editors/mesh/meshtools.c	2012-10-25 08:48:05 UTC (rev 51611)
@@ -165,6 +165,9 @@
 		return OPERATOR_CANCELLED;
 	}
 
+	/* remove tessface to ensure we don't old references to invalid faces */
+	BKE_mesh_tessface_clear(me);
+
 	/* new material indices and material array */
 	matar = MEM_callocN(sizeof(void *) * totmat, "join_mesh matar");
 	if (totmat) matmap = MEM_callocN(sizeof(int) * totmat, "join_mesh matmap");
@@ -513,7 +516,8 @@
 	me->ldata = ldata;
 	me->pdata = pdata;
 
-	mesh_update_customdata_pointers(me, TRUE); /* BMESH_TODO, check if this arg can be failse, non urgent - campbell */
+	/* tessface data removed above, no need to update */
+	mesh_update_customdata_pointers(me, FALSE);
 	
 	/* old material array */
 	for (a = 1; a <= ob->totcol; a++) {




More information about the Bf-blender-cvs mailing list