[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60314] branches/soc-2013-rigid_body_sim/ intern/rigidbody/rb_bullet_api.cpp: rigidbody: Don' t handle collision after hitting a trigger

[Sergej Reich]

Revision: 60314
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60314
Author:   sergof
Date:     2013-09-22 14:42:25 +0000 (Sun, 22 Sep 2013)
Log Message:
-----------
rigidbody: Don't handle collision after hitting a trigger

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-22 13:49:59 UTC (rev 60313)
+++ branches/soc-2013-rigid_body_sim/intern/rigidbody/rb_bullet_api.cpp	2013-09-22 14:42:25 UTC (rev 60314)
@@ -175,8 +175,10 @@
 			activate(rb1);
 			break;
 		case ACTIVATION_TRIGGER:
-			if (rb0->is_trigger)
+			if (rb0->is_trigger) {
 				activate(rb1);
+				return;
+			}
 			break;
 		}
 	}
@@ -186,8 +188,10 @@
 			activate(rb0);
 			break;
 		case ACTIVATION_TRIGGER:
-			if (rb1->is_trigger)
+			if (rb1->is_trigger) {
 				activate(rb0);
+				return;
+			}
 			break;
 		}
 	}