-Integers and Float should interpolate on animation, maybe fixes godo…

…tengine#1891, please test
fire-forge · May 16, 2015 · adb709a · adb709a
1 parent bbe9a37
commit adb709a
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/core/variant_op.cpp b/core/variant_op.cpp
@@ -3388,7 +3388,15 @@ Variant Variant::iter_get(const Variant& r_iter,bool &r_valid) const {
 void Variant::interpolate(const Variant& a, const Variant& b, float c,Variant &r_dst) {
 
 	if (a.type!=b.type) {
-		r_dst=a;
+		if (a.is_num() && b.is_num()) {
+			//not as efficient but..
+			real_t va=a;
+			real_t vb=b;
+			r_dst=(1.0-c) * va + vb * c;
+
+		} else {
+			r_dst=a;
+		}
 		return;
 	}