[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60285] branches/soc-2013-rigid_body_sim/ intern/rigidbody/rb_bullet_api.cpp: rigidbody: Fix activation on collision when both bodies were deactivated

[Sergej Reich]

Revision: 60285
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60285
Author:   sergof
Date:     2013-09-21 05:12:07 +0000 (Sat, 21 Sep 2013)
Log Message:
-----------
rigidbody: Fix activation on collision when both bodies were deactivated

Missed checking for both members of collision pair.

Modified Paths:
--------------
    branches/soc-2013-rigid_body_sim/intern/rigidbody/rb_bullet_api.cpp

Modified: branches/soc-2013-rigid_body_sim/intern/rigidbody/rb_bullet_api.cpp
===================================================================
--- branches/soc-2013-rigid_body_sim/intern/rigidbody/rb_bullet_api.cpp	2013-09-21 05:12:05 UTC (rev 60284)
+++ branches/soc-2013-rigid_body_sim/intern/rigidbody/rb_bullet_api.cpp	2013-09-21 05:12:07 UTC (rev 60285)
@@ -162,6 +162,9 @@
 	if (rb1->suspended && !(rb1->activation_type == ACTIVATION_TRIGGER && !rb0->is_trigger)) {
 		activate(rb1);
 	}
+	if (rb0->suspended && !(rb0->activation_type == ACTIVATION_TRIGGER && !rb1->is_trigger)) {
+		activate(rb0);
+	}
 	dispatcher.defaultNearCallback(collisionPair, dispatcher, dispatchInfo);
 }