yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2768
committer: Václav Šmilauer <eu@xxxxxxxx>
branch nick: yade
timestamp: Sun 2011-02-27 15:26:15 +0100
message:
  fix error in last commit
modified:
  pkg/common/InteractionLoop.cpp
  scripts/test/hdaps.py


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'pkg/common/InteractionLoop.cpp'
--- pkg/common/InteractionLoop.cpp	2011-02-27 13:54:43 +0000
+++ pkg/common/InteractionLoop.cpp	2011-02-27 14:26:15 +0000
@@ -35,9 +35,11 @@
 		LOG_WARN("Interactions pending erase found (erased), no collider being used?");
 		alreadyWarnedNoCollider=true;
 	}
+	/*
 	if(scene->interactions->dirty){
 		throw std::logic_error("InteractionContainer::dirty is true; the collider should re-initialize in such case and clear the dirty flag.");
 	}
+	*/
 	// update Scene* of the dispatchers
 	geomDispatcher->scene=physDispatcher->scene=lawDispatcher->scene=scene;
 	// ask dispatchers to update Scene* of their functors

=== modified file 'scripts/test/hdaps.py'
--- scripts/test/hdaps.py	2011-01-12 16:22:18 +0000
+++ scripts/test/hdaps.py	2011-02-27 14:26:15 +0000
@@ -3,7 +3,7 @@
 # laptop.
 
 O.bodies.append(
-	geom.facetBox(center=(0,0,.1),extents=(.5,.5,.1),wallMask=31,color=(0,0,1))+
+	utils.facetBox(center=(0,0,.1),extents=(.5,.5,.1),wallMask=31,color=(0,0,1))+
 	[utils.sphere((0,0,.1),.04,color=(1,1,1))]
 )