[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41540] trunk/blender/source/blender/ makesrna/intern/rna_object.c: Fix #29138: changing game engine physics type from soft body to occluder, navmesh

[Brecht Van Lommel]

Revision: 41540
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41540
Author:   blendix
Date:     2011-11-05 00:59:50 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Fix #29138: changing game engine physics type from soft body to occluder, navmesh
or no collision did not clear flag properly, causing soft body to still be
partially applied.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_object.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2011-11-05 00:52:01 UTC (rev 41539)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2011-11-05 00:59:50 UTC (rev 41540)
@@ -901,11 +901,11 @@
 		break;
 	case OB_BODY_TYPE_OCCLUDER:
 		ob->gameflag |= OB_OCCLUDER;
-		ob->gameflag &= ~(OB_SENSOR|OB_COLLISION|OB_DYNAMIC|OB_NAVMESH);
+		ob->gameflag &= ~(OB_SENSOR|OB_RIGID_BODY|OB_SOFT_BODY|OB_COLLISION|OB_DYNAMIC|OB_NAVMESH);
 		break;
 	case OB_BODY_TYPE_NAVMESH:
 		ob->gameflag |= OB_NAVMESH;
-		ob->gameflag &= ~(OB_SENSOR|OB_COLLISION|OB_DYNAMIC|OB_OCCLUDER);
+		ob->gameflag &= ~(OB_SENSOR|OB_RIGID_BODY|OB_SOFT_BODY|OB_COLLISION|OB_DYNAMIC|OB_OCCLUDER);
 
 		if (ob->type == OB_MESH) {
 			/* could be moved into mesh UI but for now ensure mesh data layer */
@@ -914,7 +914,7 @@
 
 		break;
 	case OB_BODY_TYPE_NO_COLLISION:
-		ob->gameflag &= ~(OB_SENSOR|OB_COLLISION|OB_OCCLUDER|OB_DYNAMIC|OB_NAVMESH);
+		ob->gameflag &= ~(OB_SENSOR|OB_RIGID_BODY|OB_SOFT_BODY|OB_COLLISION|OB_OCCLUDER|OB_DYNAMIC|OB_NAVMESH);
 		break;
 	case OB_BODY_TYPE_STATIC:
 		ob->gameflag |= OB_COLLISION;