Fix a problem with node traversal masks and paged model loading that

shows up as a non solid carrier under some circumstance.

Modified Files:
	AIBase.cxx AIBase.hxx AIShip.cxx

diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index 476ada122b117f9c55b2f7975dc81f2c33e258f3..a57b5505d636c4d50ca17048702c93ff56d99ae2 100644 (file)
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -174,7 +174,6 @@ bool FGAIBase::init(bool search_in_AI_path) {
     model = load3DModel(f, props);
 
     if (model.valid() && _initialized == false) {
-        model->setNodeMask(model->getNodeMask() & ~SG_NODEMASK_TERRAIN_BIT);
         aip.init( model.get() );
         aip.setVisible(true);
         invisible = false;
@@ -192,6 +191,9 @@ bool FGAIBase::init(bool search_in_AI_path) {
 void FGAIBase::initModel(osg::Node *node)
 {
     if (model.valid()) {
+        // Disable altitude computations for general AI models.
+        model->setNodeMask(model->getNodeMask() & ~SG_NODEMASK_TERRAIN_BIT);
+
         fgSetString("/ai/models/model-added", props->getPath());
 
     } else if (!model_path.empty()) {