[Bf-blender-cvs] [d641391] hair_system: Changed the hair ghost collision group to Default and set mask to 0 for now.

[Lukas Tönne]

Commit: d6413911bfdda4612885105fc341779b7bff5147
Author: Lukas Tönne
Date:   Tue Aug 5 09:30:40 2014 +0200
Branches: hair_system
https://developer.blender.org/rBd6413911bfdda4612885105fc341779b7bff5147

Changed the hair ghost collision group to Default and set mask to 0 for
now.

This disables all hair-hair collisions, which would otherwise cause
massive performance drop due to exponential contact generation. Doing
proper hair-hair contact pruning is one of the main challenges further
down the line.

===================================================================

M	intern/rigidbody/rb_bullet_api.cpp

===================================================================

diff --git a/intern/rigidbody/rb_bullet_api.cpp b/intern/rigidbody/rb_bullet_api.cpp
index 2b79d4d..5adc167 100644
--- a/intern/rigidbody/rb_bullet_api.cpp
+++ b/intern/rigidbody/rb_bullet_api.cpp
@@ -289,7 +289,7 @@ void RB_dworld_add_ghost(rbDynamicsWorld *world, rbGhostObject *object, int col_
 	btGhostObject *ghost = &object->ghost;
 	object->col_groups = col_groups;
 	
-	world->dynamicsWorld->addCollisionObject(ghost, btBroadphaseProxy::AllFilter, btBroadphaseProxy::AllFilter);
+	world->dynamicsWorld->addCollisionObject(ghost, btBroadphaseProxy::DefaultFilter, 0);
 }
 
 void RB_dworld_remove_ghost(rbDynamicsWorld *world, rbGhostObject *object)