archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

gameengine physics: removing triangle mesh collision option for character controllers

Browse Source
This commit is contained in:
Inês Almeida
2014-08-17 19:55:57 +02:00
parent 938fa934c8
commit d2c2b10aeb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesrna/intern/rna_object.c
View File

@@ -508,7 +508,9 @@ static EnumPropertyItem *rna_Object_collision_bounds_itemf(bContext *UNUSED(C),
EnumPropertyItem *item = NULL; EnumPropertyItem *item = NULL;
int totitem = 0; 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); RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_CONVEX_HULL);
if (ob->body_type != OB_BODY_TYPE_SOFT) { if (ob->body_type != OB_BODY_TYPE_SOFT) {