summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--editor/animation_bezier_editor.cpp4
-rw-r--r--editor/plugins/tiles/tile_map_layer_editor.cpp3
-rw-r--r--servers/rendering/shader_language.cpp1
3 files changed, 5 insertions, 3 deletions
diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp
index d192ce0356..ad7598202f 100644
--- a/editor/animation_bezier_editor.cpp
+++ b/editor/animation_bezier_editor.cpp
@@ -872,14 +872,14 @@ void AnimationBezierTrackEdit::_change_selected_keys_handle_mode(Animation::Hand
}
void AnimationBezierTrackEdit::_clear_selection_for_anim(const Ref<Animation> &p_anim) {
- if (!(animation == p_anim)) {
+ if (!(animation == p_anim) || !is_visible()) {
return;
}
_clear_selection();
}
void AnimationBezierTrackEdit::_select_at_anim(const Ref<Animation> &p_anim, int p_track, real_t p_pos, bool p_single) {
- if (!(animation == p_anim)) {
+ if (!(animation == p_anim) || !is_visible()) {
return;
}
diff --git a/editor/plugins/tiles/tile_map_layer_editor.cpp b/editor/plugins/tiles/tile_map_layer_editor.cpp
index f6e4c6f951..d3afd25502 100644
--- a/editor/plugins/tiles/tile_map_layer_editor.cpp
+++ b/editor/plugins/tiles/tile_map_layer_editor.cpp
@@ -764,12 +764,13 @@ bool TileMapLayerEditorTilesPlugin::forward_canvas_gui_input(const Ref<InputEven
} else {
// Released.
- drag_erasing = false;
if (drag_type == DRAG_TYPE_NONE) {
+ drag_erasing = false;
return false;
} else {
_stop_dragging();
}
+ drag_erasing = false;
}
CanvasItemEditor::get_singleton()->update_viewport();
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp
index 5f1643229c..f5e0b811a2 100644
--- a/servers/rendering/shader_language.cpp
+++ b/servers/rendering/shader_language.cpp
@@ -10837,4 +10837,5 @@ ShaderLanguage::ShaderLanguage() {
ShaderLanguage::~ShaderLanguage() {
clear();
+ global_func_set.clear();
}