[Bf-blender-cvs] [423ee21] soc-2014-bge: gameengine physics: removing triangle mesh collision option for character controllers

[Ines Almeida]

Commit: 423ee2164037edd51fced613ac583a3f3658b11a
Author: Ines Almeida
Date:   Sun Aug 17 19:55:57 2014 +0200
Branches: soc-2014-bge
https://developer.blender.org/rB423ee2164037edd51fced613ac583a3f3658b11a

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 5d10a0a..b50b28e 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -500,7 +500,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) {