From f3759d677ea8c95dc17e4b867c1c5394e83d6924 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Wed, 12 Feb 2020 00:38:35 +0200 Subject: [PATCH] Load the image of the cursor once This should fix some rare crashes as well --- Scripts/Canvas.gd | 2 +- Scripts/Global.gd | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Scripts/Canvas.gd b/Scripts/Canvas.gd index 82bc2ee61..dcd24fecb 100644 --- a/Scripts/Canvas.gd +++ b/Scripts/Canvas.gd @@ -248,7 +248,7 @@ func _input(event : InputEvent) -> void: Global.cursor_position_label.text = "[%s×%s] %s, %s" % [size.x, size.y, mouse_pos_floored.x, mouse_pos_floored.y] if !cursor_inside_canvas: cursor_inside_canvas = true - Input.set_custom_mouse_cursor(load("res://Assets/Graphics/Cursor.png"), 0, Vector2(15, 15)) + Input.set_custom_mouse_cursor(Global.cursor_image, 0, Vector2(15, 15)) if Global.show_left_tool_icon: Global.left_cursor.visible = true if Global.show_right_tool_icon: diff --git a/Scripts/Global.gd b/Scripts/Global.gd index 1114ccea3..2a8670a1c 100644 --- a/Scripts/Global.gd +++ b/Scripts/Global.gd @@ -19,15 +19,16 @@ var has_focus := false var canvases := [] # warning-ignore:unused_class_variable var hidden_canvases := [] - var pressure_sensitivity_mode = Pressure_Sensitivity.ALPHA var smooth_zoom := true +var cursor_image = preload("res://Assets/Graphics/Cursor.png") var left_cursor_tool_texture : ImageTexture var right_cursor_tool_texture : ImageTexture var transparent_background : ImageTexture # warning-ignore:unused_class_variable var selected_pixels := [] var image_clipboard : Image + # warning-ignore:unused_class_variable var theme_type := "Dark" # warning-ignore:unused_class_variable