diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-11-20 10:15:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-20 10:15:08 +0100 |
commit | a0f49396d6393219fed338f9a7f1e2df879b8ad7 (patch) | |
tree | 72238dbb740a0742f5f2dc10ab926eaeb137a63f /core | |
parent | 63e91029b12cb2baf7514ee2d16a70c0d6ff460c (diff) | |
parent | fd81c001fc029f0c0f1097562515c54d9e18c242 (diff) |
Merge pull request #13080 from Slowgames/bugfix/10721
Basis accepts Vector3 as constructor argument.
Diffstat (limited to 'core')
-rw-r--r-- | core/variant.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index 1dca494492..d4143b8d84 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -267,6 +267,7 @@ bool Variant::can_convert(Variant::Type p_type_from, Variant::Type p_type_to) { static const Type valid[] = { QUAT, + VECTOR3, NIL }; |