Merge de6a30e85d into 033238b787

src/Tools/BaseShapeDrawer.gd

@@ -148,7 +148,6 @@ func draw_end(pos: Vector2i) -> void:
 		_start = Vector2i.ZERO
 		_dest = Vector2i.ZERO
 		_drawing = false
-		Global.canvas.previews_sprite.texture = null
 		_displace_origin = false
 		cursor_text = ""
 	super.draw_end(pos)
@@ -175,6 +174,8 @@ func draw_preview() -> void:
 				image.set_pixelv(point, Color.WHITE)
 		var texture := ImageTexture.create_from_image(image)
 		canvas.texture = texture
+	else:
+		canvas.texture = null
 
 
 func _draw_shape(origin: Vector2i, dest: Vector2i) -> void:

src/Tools/DesignTools/CurveTool.gd

@@ -128,6 +128,7 @@ func draw_end(pos: Vector2i) -> void:
 func draw_preview() -> void:
 	var previews := Global.canvas.previews_sprite
 	if not _drawing:
+		previews.texture = null
 		return
 	var points := _bezier()
 	var image := Image.create(
@@ -206,7 +207,6 @@ func _clear() -> void:
 	_curve.clear_points()
 	_fill_inside_rect = Rect2i()
 	_drawing = false
-	Global.canvas.previews_sprite.texture = null
 	_editing_out_control_point = false
 	Global.canvas.previews.queue_redraw()
 

src/Tools/DesignTools/LineTool.gd

@@ -142,7 +142,6 @@ func draw_end(pos: Vector2i) -> void:
 		_start = Vector2.ZERO
 		_dest = Vector2.ZERO
 		_drawing = false
-		Global.canvas.previews_sprite.texture = null
 		_displace_origin = false
 		cursor_text = ""
 	super.draw_end(pos)
@@ -164,6 +163,8 @@ func draw_preview() -> void:
 				image.set_pixelv(point, Color.WHITE)
 		var texture := ImageTexture.create_from_image(image)
 		canvas.texture = texture
+	else:
+		canvas.texture = null
 
 
 func _draw_shape() -> void:

src/Tools/SelectionTools/EllipseSelect.gd

@@ -68,6 +68,8 @@ func draw_preview() -> void:
 				image.set_pixelv(point, Color.WHITE)
 		var texture := ImageTexture.create_from_image(image)
 		canvas.texture = texture
+	else:
+		canvas.texture = null
 
 
 func apply_selection(_position: Vector2i) -> void:
@@ -109,7 +111,6 @@ func apply_selection(_position: Vector2i) -> void:
 
 		Global.canvas.selection.big_bounding_rectangle = project.selection_map.get_used_rect()
 		Global.canvas.selection.commit_undo("Select", undo_data)
-	Global.canvas.previews_sprite.texture = null
 
 
 func set_ellipse(selection_map: SelectionMap, pos: Vector2i) -> void:

src/Tools/SelectionTools/Lasso.gd

@@ -54,6 +54,8 @@ func draw_preview() -> void:
 				image.set_pixelv(draw_point, Color.WHITE)
 		var texture := ImageTexture.create_from_image(image)
 		canvas.texture = texture
+	else:
+		canvas.texture = null
 
 
 func apply_selection(_position) -> void:
@@ -80,7 +82,6 @@ func apply_selection(_position) -> void:
 	Global.canvas.selection.commit_undo("Select", undo_data)
 	_draw_points.clear()
 	_last_position = Vector2.INF
-	Global.canvas.previews_sprite.texture = null
 
 
 func lasso_selection(

src/Tools/SelectionTools/PaintSelect.gd

@@ -82,6 +82,8 @@ func draw_preview() -> void:
 				image.set_pixelv(draw_point, Color.WHITE)
 		var texture := ImageTexture.create_from_image(image)
 		canvas.texture = texture
+	else:
+		canvas.texture = null
 
 
 func apply_selection(pos: Vector2i) -> void:
@@ -109,7 +111,6 @@ func apply_selection(pos: Vector2i) -> void:
 	Global.canvas.selection.commit_undo("Select", undo_data)
 	_draw_points.clear()
 	_last_position = Vector2.INF
-	Global.canvas.previews_sprite.texture = null
 
 
 func paint_selection(

src/Tools/SelectionTools/PolygonSelect.gd

@@ -89,6 +89,8 @@ func draw_preview() -> void:
 				image.set_pixelv(draw_point, Color.WHITE)
 		var texture := ImageTexture.create_from_image(image)
 		previews.texture = texture
+	else:
+		previews.texture = null
 
 
 func apply_selection(pos: Vector2i) -> void:
@@ -120,7 +122,6 @@ func apply_selection(pos: Vector2i) -> void:
 
 func _clear() -> void:
 	_ongoing_selection = false
-	Global.canvas.previews_sprite.texture = null
 	_draw_points.clear()
 	_ready_to_apply = false
 	Global.canvas.previews.queue_redraw()