gameengine physics: removing triangle mesh collision option for character controllers
authorInes Almeida <britalmeida@gmail.com>
Sun, 17 Aug 2014 17:55:57 +0000 (19:55 +0200)
committerInes Almeida <britalmeida@gmail.com>
Thu, 19 Feb 2015 11:20:17 +0000 (11:20 +0000)
source/blender/makesrna/intern/rna_object.c

index 18d506a3503b71b99d12ec868fb2712548b62595..db3b39116b4cb33fd3a60c42e40d25d7ffaceb5e 100644 (file)
@@ -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) {