[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22724] branches/blender2.5/blender/source /gameengine: deprecated world settings were being used making new world' s have zero gravity in the game engine.

[Campbell Barton]

Revision: 22724
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22724
Author:   campbellbarton
Date:     2009-08-23 19:33:34 +0200 (Sun, 23 Aug 2009)

Log Message:
-----------
deprecated world settings were being used making new world's have zero gravity in the game engine.
Double checked these aren't used anymore by renaming the vars in DNA_world_types.h

Modified Paths:
--------------
    branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp

Modified: branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2009-08-23 17:03:06 UTC (rev 22723)
+++ branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2009-08-23 17:33:34 UTC (rev 22724)
@@ -2485,10 +2485,10 @@
 			}
 		}
 		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

Modified: branches/blender2.5/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp	2009-08-23 17:03:06 UTC (rev 22723)
+++ branches/blender2.5/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp	2009-08-23 17:33:34 UTC (rev 22724)
@@ -382,12 +382,12 @@
 	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
 	{