From 16b5dd5e78d747ceb2100d6cc49c3f0681e2d608 Mon Sep 17 00:00:00 2001
From: Richard Harrison <rjh@zaretto.com>
Date: Thu, 31 Aug 2017 00:30:18 +0200
Subject: [PATCH] Remove message "Could not find at least one of the following
 objects for axis animation" when not relevant.

By default you can either do

1. axis -> object-name ...
2. axis -> x-m ...
3. omit axis. This will now try to find an 'object-name' with -axis appended. If this can't be found then no message will be output; and the default behaviour of just using (0,0,0) will appyl.
---
 simgear/scene/model/animation.cxx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/simgear/scene/model/animation.cxx b/simgear/scene/model/animation.cxx
index 9d897704..3e7f4399 100644
--- a/simgear/scene/model/animation.cxx
+++ b/simgear/scene/model/animation.cxx
@@ -709,12 +709,19 @@ protected:
 bool SGAnimation::setCenterAndAxisFromObject(osg::Node *rootNode, SGVec3d& center, SGVec3d &axis, simgear::SGTransientModelData &modelData) const
 {
     std::string axis_object_name = std::string();
+    bool can_warn = true;
+
     if (_configNode->hasValue("axis/object-name"))
     {
         axis_object_name = _configNode->getStringValue("axis/object-name");
     }
-    else if (!_configNode->getNode("axis"))
+    else if (!_configNode->getNode("axis")) {
         axis_object_name = _configNode->getStringValue("object-name") + std::string("-axis");
+        // for compatibility we will not warn if no axis object can be found when there was nothing 
+        // specified - as the axis could just be the default at the origin
+        // so if there is a [objectname]-axis use it, otherwise fallback to the previous behaviour
+        can_warn = false; 
+    }
 
     if (!axis_object_name.empty())
     {
@@ -764,7 +771,7 @@ bool SGAnimation::setCenterAndAxisFromObject(osg::Node *rootNode, SGVec3d& cente
                 else
                     SG_LOG(SG_INPUT, SG_ALERT, "Could find a valid line segment for animation:  " << axis_object_name);
             }
-            else
+            else if (can_warn)
                 SG_LOG(SG_INPUT, SG_ALERT, "Could not find at least one of the following objects for axis animation: " << axis_object_name);
         }
         if (axisSegment)
@@ -2358,7 +2365,7 @@ SGTexTransformAnimation::createAnimationGroup(osg::Group& parent)
   osg::Group* group = new osg::Group;
   group->setName("texture transform group");
   osg::StateSet* stateSet = group->getOrCreateStateSet();
-  stateSet->setDataVariance(osg::Object::DYNAMIC);  
+  stateSet->setDataVariance(osg::Object::STATIC/*osg::Object::DYNAMIC*/);  
   osg::TexMat* texMat = new osg::TexMat;
   UpdateCallback* updateCallback = new UpdateCallback(getCondition());
   // interpret the configs ...