diff options
| author | Ricardo Pérez <ricpelo@gmail.com> | 2015-05-05 22:27:05 +0200 |
|---|---|---|
| committer | Ricardo Pérez <ricpelo@gmail.com> | 2015-05-05 22:27:05 +0200 |
| commit | 7bb53831d8aec2507f6341bd00deae29fde8e2c2 (patch) | |
| tree | bf6ce42c3dfee2707f7b8adff072297603b59a23 /core/variant.h | |
| parent | af068439829a3fec3a76c4c5d4dd2dba71ab6c5f (diff) | |
| parent | bc3c14a76b988a50e65328a932316c2e630a7ae6 (diff) | |
Merge pull request #6 from okamstudio/master
Sync
Diffstat (limited to 'core/variant.h')
| -rw-r--r-- | core/variant.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/variant.h b/core/variant.h index 85c7b92c0d..5f338ef667 100644 --- a/core/variant.h +++ b/core/variant.h @@ -165,7 +165,8 @@ public: _FORCE_INLINE_ Type get_type() const { return type; } static String get_type_name(Variant::Type p_type); - static bool can_convert(Type p_type_from,Type p_type_to); + static bool can_convert(Type p_type_from, Type p_type_to); + static bool can_convert_strict(Type p_type_from, Type p_type_to); |