Rework decal visibility updating

project/addons/terrain_3d/editor.gd

@@ -170,11 +170,7 @@ func _forward_3d_gui_input(p_viewport_camera: Camera3D, p_event: InputEvent) ->
 
 		## Update decal
 		ui.decal.global_position = mouse_global_position
-		ui.decal.albedo_mix = 1.0
-		if ui.decal_timer.is_stopped():
-			ui.update_decal()
-		else:
-			ui.decal_timer.start()
+		ui.update_decal()
 
 		## Update region highlight
 		var region_size = terrain.get_storage().get_region_size()
@@ -189,6 +185,8 @@ func _forward_3d_gui_input(p_viewport_camera: Camera3D, p_event: InputEvent) ->
 			return AFTER_GUI_INPUT_STOP
 
 	elif p_event is InputEventMouseButton:
+		if p_event.get_button_index() == MOUSE_BUTTON_RIGHT and p_event.is_released():
+			ui.last_rmb_time = Time.get_ticks_msec()
 		ui.update_decal()
 
 		if p_event.get_button_index() == MOUSE_BUTTON_LEFT:
@@ -225,10 +223,8 @@ func _forward_3d_gui_input(p_viewport_camera: Camera3D, p_event: InputEvent) ->
 				# Mouse released, save undo data
 				editor.stop_operation()
 				return AFTER_GUI_INPUT_STOP
-
-	return AFTER_GUI_INPUT_PASS
 
-
+	return AFTER_GUI_INPUT_PASS
 
 
 func update_region_grid() -> void:

project/addons/terrain_3d/src/ui.gd

@@ -52,6 +52,7 @@ var modifier_alt: bool
 var modifier_shift: bool
 var last_tool: Terrain3DEditor.Tool
 var last_operation: Terrain3DEditor.Operation
+var last_rmb_time: int = 0
 
 
 func _enter_tree() -> void:
@@ -248,8 +249,13 @@ func _on_setting_changed() -> void:
 
 func update_decal() -> void:
 	var mouse_buttons: int = Input.get_mouse_button_mask()
+
+	# If not a state that should show the decal, hide everything and return
 	if not visible or \
 			not plugin.terrain or \
+			# Wait for cursor to recenter after right-click before revealing
+			# See https://github.com/godotengine/godot/issues/70098
+			Time.get_ticks_msec() - last_rmb_time <= 10 or \
 			brush_data.is_empty() or \
 			mouse_buttons & MOUSE_BUTTON_RIGHT or \
 			(mouse_buttons & MOUSE_BUTTON_LEFT and not brush_data["show_cursor_while_painting"]) or \
@@ -258,12 +264,8 @@ func update_decal() -> void:
 		for gradient_decal in gradient_decals:
 			gradient_decal.visible = false
 		return
-	else:
-		# Wait for cursor to recenter after right-click before revealing
-		# See https://github.com/godotengine/godot/issues/70098
-		await get_tree().create_timer(.05).timeout 
-		decal.visible = true
 
+	decal.visible = true
 	decal.size = Vector3.ONE * brush_data["size"]
 	if brush_data["align_to_view"]:
 		var cam: Camera3D = plugin.terrain.get_camera();