diff options
| author | Ines Almeida <britalmeida@gmail.com> | 2014-08-17 21:55:57 +0400 |
|---|---|---|
| committer | Ines Almeida <britalmeida@gmail.com> | 2015-02-19 14:20:17 +0300 |
| commit | d2c2b10aeb47e27a8f7f50187d05f4c89c9e391e (patch) | |
| tree | a499cde908c7302c6ada57e4cba22738a4f09071 /source/blender/makesrna/intern/rna_object.c | |
| parent | 938fa934c87a9feba0ab55ed204a2617d082b706 (diff) | |
gameengine physics: removing triangle mesh collision option for character controllers
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 18d506a3503..db3b39116b4 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) { |