Commit: 40b2e75b2018a2ff348013ee8322ad2e30734a94 Author: Ulysse Martin Date: Wed Oct 28 02:02:31 2015 +0100 Branches: master https://developer.blender.org/rB40b2e75b2018a2ff348013ee8322ad2e30734a94
BGE: Fix T46557: Empty collision bounds option with character physics - Fix in rna_object.c rna_GameObjectSettings_physics_type_set->The collision bounds type can't be empty for character physics - Add do_version for the .blends already saved with collision bounds option empty (characters) Reviewers: campbellbarton, panzergame, lordloki Reviewed By: panzergame, lordloki Subscribers: lordloki Projects: #game_engine Maniphest Tasks: T46557 Differential Revision: https://developer.blender.org/D1576 =================================================================== M source/blender/blenloader/intern/versioning_270.c M source/blender/makesrna/intern/rna_object.c =================================================================== diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index 72f9897..b5199e1 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -909,6 +909,15 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) #undef LA_YF_PHOTON } + { + Object *ob; + for (ob = main->object.first; ob; ob = ob->id.next) { + if (ob->body_type == OB_BODY_TYPE_CHARACTER && (ob->gameflag & OB_BOUNDS) && ob->collision_boundtype == OB_BOUND_TRIANGLE_MESH) { + ob->boundtype = ob->collision_boundtype = OB_BOUND_BOX; + } + } + } + } { @@ -925,4 +934,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) } } } + + } diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index f36b2a9..8e031b6 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1036,6 +1036,11 @@ static void rna_GameObjectSettings_physics_type_set(PointerRNA *ptr, int value) ob->gameflag |= OB_COLLISION | OB_CHARACTER; ob->gameflag &= ~(OB_SENSOR | OB_OCCLUDER | OB_DYNAMIC | OB_RIGID_BODY | OB_SOFT_BODY | OB_ACTOR | OB_ANISOTROPIC_FRICTION | OB_DO_FH | OB_ROT_FH | OB_COLLISION_RESPONSE | OB_NAVMESH); + /* When we switch to character physics and the collision bounds is set to triangle mesh + we have to change collision bounds because triangle mesh is not supported by Characters*/ + if ((ob->gameflag & OB_BOUNDS) && ob->collision_boundtype == OB_BOUND_TRIANGLE_MESH) { + ob->boundtype = ob->collision_boundtype = OB_BOUND_BOX; + } break; case OB_BODY_TYPE_STATIC: ob->gameflag |= OB_COLLISION; _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
