svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / gameengine / Ketsji / KX_KetsjiEngine.cpp
index a43ea59220b3d736550e44c1d88c9b60e165943e..cc0f50d9e7afb767fdc00e145b0bd0631b776dcf 100644 (file)
 #include "KX_PyConstraintBinding.h"
 #include "PHY_IPhysicsEnvironment.h"
 
-#ifdef USE_SUMO_SOLID
-#include "SumoPhysicsEnvironment.h"
-#endif
-
 #include "SND_Scene.h"
 #include "SND_IAudioDevice.h"
 
@@ -400,9 +396,9 @@ void KX_KetsjiEngine::StartEngine(bool clearIpo)
        World* world = m_scenes[0]->GetBlenderScene()->world;
        if (world)
        {
-               m_ticrate = world->ticrate;
-               m_maxLogicFrame = world->maxlogicstep;
-               m_maxPhysicsFrame = world->maxphystep;
+               m_ticrate = world->ticrate ? world->ticrate : DEFAULT_LOGIC_TIC_RATE;
+               m_maxLogicFrame = world->maxlogicstep ? world->maxlogicstep : 5;
+               m_maxPhysicsFrame = world->maxphystep ? world->maxlogicstep : 5;
        }
        else
        {