From 200b7bb87c3d8d8b2011b08ed4bd7b034ceb452f Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Sat, 5 Dec 2015 14:18:22 -0300
Subject: -Display on animation editor which keys are invalid and which tracks
 are unresolved -Added a tool to clean up unresolved tracks and unused keys

---
 core/variant_call.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/variant_call.cpp')

diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index 48c38f05f..0d0248ef2 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -959,7 +959,7 @@ Variant Variant::call(const StringName& p_method,const Variant** p_args,int p_ar
 #define VCALL(m_type,m_method) _VariantCall::_call_##m_type##_##m_method
 
 
-Variant Variant::construct(const Variant::Type p_type,const Variant** p_args,int p_argcount,CallError &r_error) {
+Variant Variant::construct(const Variant::Type p_type, const Variant** p_args, int p_argcount, CallError &r_error, bool p_strict) {
 
 	r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD;
 	ERR_FAIL_INDEX_V(p_type,VARIANT_MAX,Variant());
@@ -1035,7 +1035,7 @@ Variant Variant::construct(const Variant::Type p_type,const Variant** p_args,int
 
 	} else if (p_argcount==1 && p_args[0]->type==p_type) {
 		return *p_args[0]; //copy construct
-	} else if (p_argcount==1 && Variant::can_convert(p_args[0]->type,p_type)) {
+	} else if (p_argcount==1 && (!p_strict || Variant::can_convert(p_args[0]->type,p_type))) {
 		//near match construct
 
 		switch(p_type) {
-- 
cgit v1.2.3-70-g09d2