From: Thomas Geymayer <tomgey@gmail.com>
Date: Thu, 4 Jul 2013 17:46:27 +0000 (+0200)
Subject: interpolate without values is used to abort interpolating -> no warning
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=948db69cc9e9f07ad9ef51a37cc8a5f372ca31b2;p=simgear.git

interpolate without values is used to abort interpolating -> no warning
---

diff --git a/simgear/props/PropertyInterpolationMgr.cxx b/simgear/props/PropertyInterpolationMgr.cxx
index 0ec4ad79..ad8060e2 100644
--- a/simgear/props/PropertyInterpolationMgr.cxx
+++ b/simgear/props/PropertyInterpolationMgr.cxx
@@ -193,12 +193,6 @@ namespace simgear
       SG_LOG(SG_GENERAL, SG_WARN, "interpolate: sizes do not match");
 
     size_t num_values = std::min(values.size(), deltas.size());
-    if( !num_values )
-    {
-      SG_LOG(SG_GENERAL, SG_WARN, "interpolate: no values");
-      return false;
-    }
-
     PropertyInterpolatorRef first_interp, cur_interp;
     for(size_t i = 0; i < num_values; ++i)
     {
diff --git a/simgear/props/PropertyInterpolationMgr.hxx b/simgear/props/PropertyInterpolationMgr.hxx
index 446fad94..efd907d9 100644
--- a/simgear/props/PropertyInterpolationMgr.hxx
+++ b/simgear/props/PropertyInterpolationMgr.hxx
@@ -76,14 +76,15 @@ namespace simgear
                           const std::string& easing );
 
       /**
-       * Add animation of the given property from current its current value to
-       * the target value of the interpolator.
+       * Add animation of the given property from its current value to the
+       * target value of the interpolator. If no interpolator is given any
+       * existing animation of the given property is aborted.
        *
        * @param prop    Property to be interpolated
        * @param interp  Interpolator used for interpolation
        */
       bool interpolate( SGPropertyNode* prop,
-                        PropertyInterpolatorRef interp );
+                        PropertyInterpolatorRef interp  = 0 );
 
       bool interpolate( SGPropertyNode* prop,
                         const std::string& type,