[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61115] trunk/blender/source/gameengine/ Ketsji/KX_Scene.cpp: bge builds again without bullet.

Campbell Barton ideasman42 at gmail.com
Tue Nov 5 07:19:19 CET 2013


Revision: 61115
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61115
Author:   campbellbarton
Date:     2013-11-05 06:19:19 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
bge builds again without bullet.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp	2013-11-05 04:34:56 UTC (rev 61114)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp	2013-11-05 06:19:19 UTC (rev 61115)
@@ -562,6 +562,7 @@
 		newobj->SetGraphicController(newctrl);
 	}
 
+#ifdef WITH_BULLET
 	// replicate physics controller
 	if (orgobj->GetPhysicsController())
 	{
@@ -578,6 +579,8 @@
 		if (parent)
 			parent->Release();
 	}
+#endif
+
 	return newobj;
 }
 
@@ -1905,10 +1908,12 @@
 		ctrl->SetPhysicsEnvironment(to->GetPhysicsEnvironment());
 	}
 
+#ifdef WITH_BULLET
 	ctrl = gameobj->GetPhysicsController();
 	if (ctrl) {
 		ctrl->SetPhysicsEnvironment(to->GetPhysicsEnvironment());
 	}
+#endif
 
 	/* SG_Node can hold a scene reference */
 	SG_Node *sg= gameobj->GetSGNode();




More information about the Bf-blender-cvs mailing list