diff options
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/animation/tween.cpp | 1 | ||||
| -rwxr-xr-x | scene/main/node.cpp | 1 | ||||
| -rw-r--r-- | scene/main/viewport.cpp | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index c455d20b14..bb7ea47178 100644 --- a/scene/animation/tween.cpp +++ b/scene/animation/tween.cpp @@ -610,6 +610,7 @@ void Tween::_tween_process(float p_delta) { _apply_tween_value(data, result); if (data.finish) { + _apply_tween_value(data, data.final_val); emit_signal("tween_completed", object, data.key); // not repeat mode, remove completed action if (!repeat) diff --git a/scene/main/node.cpp b/scene/main/node.cpp index c13ed232a7..42e9cec217 100755 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -2914,6 +2914,7 @@ void Node::_bind_methods() { BIND_CONSTANT(DUPLICATE_SIGNALS); BIND_CONSTANT(DUPLICATE_GROUPS); BIND_CONSTANT(DUPLICATE_SCRIPTS); + BIND_CONSTANT(DUPLICATE_USE_INSTANCING); ADD_SIGNAL(MethodInfo("renamed")); ADD_SIGNAL(MethodInfo("tree_entered")); diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 23f8189167..3b8fd1ae3e 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1401,7 +1401,7 @@ void Viewport::_vp_input(const InputEvent &p_ev) { return; #ifdef TOOLS_ENABLED - if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root()->is_a_parent_of(this)) { + if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root() && get_tree()->get_edited_scene_root()->is_a_parent_of(this)) { return; } #endif @@ -1422,7 +1422,7 @@ void Viewport::_vp_unhandled_input(const InputEvent &p_ev) { if (disable_input) return; #ifdef TOOLS_ENABLED - if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root()->is_a_parent_of(this)) { + if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root() && get_tree()->get_edited_scene_root()->is_a_parent_of(this)) { return; } #endif |