[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12382] branches/cloth/blender/source/ blender/blenkernel/intern: Fixed some bugs in bounding volumes, still some crasher in new cloth modifier

Daniel Genrich daniel.genrich at gmx.net
Wed Oct 24 19:13:14 CEST 2007


Revision: 12382
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12382
Author:   genscher
Date:     2007-10-24 19:13:13 +0200 (Wed, 24 Oct 2007)

Log Message:
-----------
Fixed some bugs in bounding volumes, still some crasher in new cloth modifier

Modified Paths:
--------------
    branches/cloth/blender/source/blender/blenkernel/intern/cloth.c
    branches/cloth/blender/source/blender/blenkernel/intern/kdop.c
    branches/cloth/blender/source/blender/blenkernel/intern/modifier.c

Modified: branches/cloth/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/cloth.c	2007-10-24 16:37:26 UTC (rev 12381)
+++ branches/cloth/blender/source/blender/blenkernel/intern/cloth.c	2007-10-24 17:13:13 UTC (rev 12382)
@@ -699,11 +699,11 @@
 				}
 
 				tstart();
-
+/*
 				// Call the solver.
 				if ( solvers [clmd->sim_parms.solver_type].solver )
 					solvers [clmd->sim_parms.solver_type].solver ( ob, framenr, clmd, effectors );
-
+*/
 				tend();
 				printf ( "Cloth simulation time: %f\n", ( float ) tval() );
 
@@ -735,7 +735,10 @@
 		}
 	}
 	
-	return result;
+	if(result)
+		return result;
+	else
+		return dm;
 }
 
 /* frees all */

Modified: branches/cloth/blender/source/blender/blenkernel/intern/kdop.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/kdop.c	2007-10-24 16:37:26 UTC (rev 12381)
+++ branches/cloth/blender/source/blender/blenkernel/intern/kdop.c	2007-10-24 17:13:13 UTC (rev 12382)
@@ -531,16 +531,9 @@
 	CollisionTree **face_list=NULL;
 	CollisionTree *tree=NULL;
 	LinkNode *nlink = NULL;
-	MFace *mface = NULL;
 	
 	nlink = bvh->tree;
 
-	if (tree == NULL) 
-	{
-		printf("bvh_build: Out of memory for nodes.\n");
-		bvh_free(bvh);
-		return NULL;
-	}
 	bvh->root = bvh->tree->link;
 	bvh->root->isleaf = 0;
 	bvh->root->parent = NULL;
@@ -695,7 +688,14 @@
 	bvh->xnew = MEM_dupallocN(x);	
 	bvh->x = MEM_dupallocN(x);	
 	tree = (CollisionTree *)MEM_callocN(sizeof(CollisionTree), "CollisionTree");
-	// TODO: check succesfull alloc
+	
+	if (tree == NULL) 
+	{
+		printf("bvh_build: Out of memory for nodes.\n");
+		bvh_free(bvh);
+		return NULL;
+	}
+	
 	BLI_linklist_append(&bvh->tree, tree);
 	
 	return bvh_build(bvh, mfaces, numfaces);

Modified: branches/cloth/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/modifier.c	2007-10-24 16:37:26 UTC (rev 12381)
+++ branches/cloth/blender/source/blender/blenkernel/intern/modifier.c	2007-10-24 17:13:13 UTC (rev 12382)
@@ -4903,7 +4903,7 @@
 
 	CDDM_calc_normals(result);
 
-	return derivedData;
+	return result;
 }
 
 static void clothModifier_updateDepgraph(





More information about the Bf-blender-cvs mailing list