Fix #1157 for the polygon select and the curve tool as well

Maybe fixes #1157

src/Classes/Layers/BaseLayer.gd

@@ -236,8 +236,8 @@ func display_effects(cel: BaseCel, image_override: Image = null) -> Image:
 			continue
 		var params := effect.params
 		params["PXO_time"] = cel.get_frame(project).position_in_seconds(project)
-		params["PXO_frame"] = project.frames.find(cel.get_frame(project))
-		params["PXO_layer"] = index
+		params["PXO_frame_index"] = project.frames.find(cel.get_frame(project))
+		params["PXO_layer_index"] = index
 		var shader_image_effect := ShaderImageEffect.new()
 		shader_image_effect.generate_image(image, effect.shader, params, image_size)
 	# Inherit effects from the parents, if their blend mode is set to pass through

src/Classes/ShaderLoader.gd

@@ -63,7 +63,7 @@ static func create_ui_for_shader_uniforms(
 		var u_init := u_left_side[0].split(" ")
 		var u_type := u_init[1]
 		var u_name := u_init[2]
-		if u_name in ["PXO_time", "PXO_frame", "PXO_layer"]:
+		if u_name in ["PXO_time", "PXO_frame_index", "PXO_layer_index"]:
 			continue
 		# Find custom data of the uniform, if any exists
 		# Right now it only checks if a uniform should have another type of node

src/Tools/BaseShapeDrawer.gd

@@ -148,6 +148,7 @@ 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)
@@ -174,8 +175,6 @@ 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,7 +128,6 @@ 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(
@@ -207,6 +206,7 @@ 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,6 +142,7 @@ 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)
@@ -163,8 +164,6 @@ 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,8 +68,6 @@ 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:
@@ -111,6 +109,7 @@ 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,8 +54,6 @@ 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:
@@ -82,6 +80,7 @@ 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,8 +82,6 @@ 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:
@@ -111,6 +109,7 @@ 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,8 +89,6 @@ 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:
@@ -122,6 +120,7 @@ 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()

src/UI/Nodes/NoiseGenerator.gd

@@ -83,7 +83,9 @@ func _set_node_values() -> void:
 		elif node is CheckBox:
 			node.button_pressed = value
 		elif node is GradientEditNode:
-			node.gradient = value
+			var gradient_tex := GradientTexture2D.new()
+			gradient_tex.gradient = value
+			node.set_gradient_texture(gradient_tex)
 
 
 func _set_value_from_node(value, prop: String) -> void:

src/UI/Timeline/LayerEffects/LayerEffectsSettings.gd

@@ -180,8 +180,8 @@ func _apply_effect(layer: BaseLayer, effect: LayerEffect) -> void:
 		var image_size := cel_image.get_size()
 		var params := effect.params
 		params["PXO_time"] = frame.position_in_seconds(project)
-		params["PXO_frame"] = i
-		params["PXO_layer"] = layer.index
+		params["PXO_frame_index"] = i
+		params["PXO_layer_index"] = layer.index
 		var shader_image_effect := ShaderImageEffect.new()
 		shader_image_effect.generate_image(cel_image, effect.shader, params, image_size)