summaryrefslogtreecommitdiffstats
path: root/core/method_bind.h
diff options
context:
space:
mode:
authorJuan Linietsky <red@kyoko>2015-05-11 15:49:41 -0300
committerJuan Linietsky <red@kyoko>2015-05-11 15:49:41 -0300
commit4b8745ad63409cf14b02735981ee35d2f794421c (patch)
tree607dcfbb77430e8ed7eef25de6b7bec9c4032aec /core/method_bind.h
parentdda60296d81edaabfdb56f47a2c949b5dad283fb (diff)
parentb777bf5ff5c3891daa0f93987ca12d0d7d053c2b (diff)
downloadredot-engine-4b8745ad63409cf14b02735981ee35d2f794421c.tar.gz
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'core/method_bind.h')
-rw-r--r--core/method_bind.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/method_bind.h b/core/method_bind.h
index d32050cc5d..49c64bd11c 100644
--- a/core/method_bind.h
+++ b/core/method_bind.h
@@ -98,7 +98,7 @@ struct VariantCaster<m_enum> {\
#define CHECK_ARG(m_arg)\
if ((m_arg-1)<p_arg_count) {\
Variant::Type argtype=get_argument_type(m_arg-1);\
- if (!Variant::can_convert(p_args[m_arg-1]->get_type(),argtype)) {\
+ if (!Variant::can_convert_strict(p_args[m_arg-1]->get_type(),argtype)) {\
r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;\
r_error.argument=m_arg-1;\
r_error.expected=argtype;\