diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-08-05 21:43:10 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-08-05 21:43:10 -0300 |
| commit | 37adf936abf018bb8b643b589c07ac0f1a036f51 (patch) | |
| tree | 43a3eb6a927918e2581096d803a056e162623d94 | |
| parent | 76ce18c2909a5a90ce92c82f5569461315029961 (diff) | |
few bugs fixed thanks to explicit bool constructor and clang.
explicit bool constructor has thus now been removed, as it served it's mission!
| -rw-r--r-- | core/variant.h | 2 | ||||
| -rw-r--r-- | modules/visual_script/visual_script_nodes.cpp | 2 | ||||
| -rw-r--r-- | scene/2d/visibility_notifier_2d.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/core/variant.h b/core/variant.h index 4d137efac2..95782d9619 100644 --- a/core/variant.h +++ b/core/variant.h @@ -239,7 +239,7 @@ public: operator IP_Address() const; - explicit Variant(bool p_bool); + Variant(bool p_bool); Variant(signed int p_int); // real one Variant(unsigned int p_int); #ifdef NEED_LONG_INT diff --git a/modules/visual_script/visual_script_nodes.cpp b/modules/visual_script/visual_script_nodes.cpp index 69aa10ebca..d5d8b8fe6e 100644 --- a/modules/visual_script/visual_script_nodes.cpp +++ b/modules/visual_script/visual_script_nodes.cpp @@ -2798,7 +2798,7 @@ public: r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; return 0; } - *p_outputs[0] = subcall->call(VisualScriptLanguage::singleton->_subcall, p_inputs, input_args, r_error_str); + *p_outputs[0] = subcall->call(VisualScriptLanguage::singleton->_subcall, p_inputs, input_args, r_error); return 0; } }; diff --git a/scene/2d/visibility_notifier_2d.cpp b/scene/2d/visibility_notifier_2d.cpp index a37c74cb07..fb71b61d45 100644 --- a/scene/2d/visibility_notifier_2d.cpp +++ b/scene/2d/visibility_notifier_2d.cpp @@ -33,6 +33,7 @@ #include "scene/2d/animated_sprite.h" #include "scene/2d/physics_body_2d.h" #include "scene/animation/animation_player.h" +#include "scene/main/viewport.h" #include "scene/scene_string_names.h" #include "scene/scene_string_names.h" |