Modified Files:

	src/AIModel/AIBase.cxx src/Main/main.cxx src/Main/renderer.cxx
	Reflect last change in SimGear

diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index 11a3877d2bdd2535f30d6f0d7598cf5cc3a55dcb..b50f9398329ebc878c4f3b6b679947655c0e8d65 100644 (file)
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -35,7 +35,6 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/scene/model/location.hxx>
 #include <simgear/scene/model/model.hxx>
-#include <simgear/scene/model/personality.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/props/props.hxx>
 
@@ -164,7 +163,7 @@ FGAIBase::load3DModel(const string& fg_root,
   // some more code here to check whether a model with this name has already been loaded
   // if not load it, otherwise, get the memory pointer and do something like
   // SetModel as in ATC/AIEntity.cxx
-  osg::Group* personality_branch = new SGPersonalityBranch;
+  osg::Group* personality_branch = new osg::Group;
 
   model = manager->getModel(path);
   if (!(model)) {

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 6f82ad88325577c99943110c739ead0720584a2c..66963c2b565c22b702e8e420d92b631fefb6721b 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -323,7 +323,6 @@ static void fgMainLoop( void ) {
     }
     last_time_stamp = current_time_stamp;
     globals->inc_sim_time_sec( delta_time_sec );
-    SGAnimation::set_sim_time_sec( globals->get_sim_time_sec() );
 
     // These are useful, especially for Nasal scripts.
     fgSetDouble("/sim/time/delta-realtime-sec", real_delta_time_sec);

diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index 21c66f26014c96f7686dd9d9150cbe6aee7b22d7..8e0cfb55d65f13ada8ece5cf83b80d8a996eb6f2 100644 (file)
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -404,7 +404,6 @@ FGRenderer::update( bool refresh_camera_settings ) {
 
         // Keep resetting sim time while the sim is initializing
         globals->set_sim_time_sec( 0.0 );
-        SGAnimation::set_sim_time_sec( 0.0 );
         return;
     }