[Bf-blender-cvs] [d2c2b10a] master: gameengine physics: removing triangle mesh collision option for character controllers

[Ines Almeida]

Commit: d2c2b10aeb47e27a8f7f50187d05f4c89c9e391e
Author: Ines Almeida
Date:   Sun Aug 17 19:55:57 2014 +0200
Branches: master
https://developer.blender.org/rBd2c2b10aeb47e27a8f7f50187d05f4c89c9e391e

gameengine physics: removing triangle mesh collision option for character 
controllers

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

M       source/blender/makesrna/intern/rna_object.c

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

diff --git a/source/blender/makesrna/intern/rna_object.c 
b/source/blender/makesrna/intern/rna_object.c
index 18d506a..db3b391 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -508,7 +508,9 @@ static EnumPropertyItem 
*rna_Object_collision_bounds_itemf(bContext *UNUSED(C),
        EnumPropertyItem *item = NULL;
        int totitem = 0;
 
-       RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, 
OB_BOUND_TRIANGLE_MESH);
+       if (ob->body_type != OB_BODY_TYPE_CHARACTER) {
+               RNA_enum_items_add_value(&item, &totitem, 
collision_bounds_items, OB_BOUND_TRIANGLE_MESH);
+       }
        RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, 
OB_BOUND_CONVEX_HULL);
 
        if (ob->body_type != OB_BODY_TYPE_SOFT) {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs