deprecated world settings were being used making new world's have zero gravity in...
authorCampbell Barton <ideasman42@gmail.com>
Sun, 23 Aug 2009 17:33:34 +0000 (17:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 23 Aug 2009 17:33:34 +0000 (17:33 +0000)
Double checked these aren't used anymore by renaming the vars in DNA_world_types.h

source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp

index 6cb4e980a3de05c0692ca86b1036ebfacb0e48ae..ed03bb0bdd56300e06c9958c23edb96eb2b0f082 100644 (file)
@@ -2485,10 +2485,10 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                        }
                }
                if (occlusion)
-                       kxscene->SetDbvtOcclusionRes(blenderscene->world->occlusionRes);
+                       kxscene->SetDbvtOcclusionRes(blenderscene->gm.occlusionRes);
        }
        if (blenderscene->world)
-               kxscene->GetPhysicsEnvironment()->setNumTimeSubSteps(blenderscene->world->physubstep);
+               kxscene->GetPhysicsEnvironment()->setNumTimeSubSteps(blenderscene->gm.physubstep);
 
        // now that the scenegraph is complete, let's instantiate the deformers.
        // We need that to create reusable derived mesh and physic shapes
index 13643e3a1acc13b7d0fb433d41304431048f8603..4117e493322976256be6041f211739de36c5bca2 100644 (file)
@@ -382,12 +382,12 @@ void KX_KetsjiEngine::StartEngine(bool clearIpo)
        m_firstframe = true;
        m_bInitialized = true;
        // there is always one scene enabled at startup
-       World* world = m_scenes[0]->GetBlenderScene()->world;
-       if (world)
+       Scene* scene = m_scenes[0]->GetBlenderScene();
+       if (scene)
        {
-               m_ticrate = world->ticrate ? world->ticrate : DEFAULT_LOGIC_TIC_RATE;
-               m_maxLogicFrame = world->maxlogicstep ? world->maxlogicstep : 5;
-               m_maxPhysicsFrame = world->maxphystep ? world->maxlogicstep : 5;
+               m_ticrate = scene->gm.ticrate ? scene->gm.ticrate : DEFAULT_LOGIC_TIC_RATE;
+               m_maxLogicFrame = scene->gm.maxlogicstep ? scene->gm.maxlogicstep : 5;
+               m_maxPhysicsFrame = scene->gm.maxphystep ? scene->gm.maxlogicstep : 5;
        }
        else
        {