[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43756] branches/bmesh/blender/source/ blender/blenkernel/intern: missed these last commit

Campbell Barton ideasman42 at gmail.com
Sun Jan 29 23:32:04 CET 2012


Revision: 43756
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43756
Author:   campbellbarton
Date:     2012-01-29 22:32:00 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
missed these last commit

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

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-01-29 22:13:08 UTC (rev 43755)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-01-29 22:32:00 UTC (rev 43756)
@@ -2786,7 +2786,7 @@
 	int *dtrisToPolysMap=NULL, *dtrisToTrisMap=NULL, *trisToFacesMap=NULL;
 	int res;
 
-	result = CDDM_copy(dm, 0);
+	result = CDDM_copy(dm);
 	if (!CustomData_has_layer(&result->faceData, CD_RECAST)) {
 		int *sourceRecastData = (int*)CustomData_get_layer(&dm->faceData, CD_RECAST);
 		if (sourceRecastData) {

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c	2012-01-29 22:13:08 UTC (rev 43755)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c	2012-01-29 22:32:00 UTC (rev 43756)
@@ -1354,7 +1354,7 @@
 			if(smd->coll->dm)
 				smd->coll->dm->release(smd->coll->dm);
 
-			smd->coll->dm = CDDM_copy(dm, 1);
+			smd->coll->dm = CDDM_copy_from_tessface(dm);
 #endif
 
 			// rigid movement support



More information about the Bf-blender-cvs mailing list