Merge branch 'Orama-Interactive:master' into resource

In case users don't want the effect to affect the alpha channel

src/Autoload/Global.gd

@@ -704,17 +704,6 @@ func _init() -> void:
 	)
 
 
-func modify_texture_resource(image: Image, resource_name: StringName, update_callable: Callable):
-	var resource_proj = ResourceProject.new([], resource_name, image.get_size())
-	resource_proj.layers.append(PixelLayer.new(resource_proj))
-	resource_proj.frames.append(resource_proj.new_empty_frame())
-	resource_proj.frames[0].cels[0].set_content(image)
-	resource_proj.resource_updated.connect(update_callable)
-	Global.projects.append(resource_proj)
-	Global.tabs.current_tab = Global.tabs.get_tab_count() - 1
-	Global.canvas.camera_zoom()
-
-
 func _ready() -> void:
 	_initialize_keychain()
 	default_width = config_cache.get_value("preferences", "default_width", default_width)

src/Classes/ShaderLoader.gd

@@ -227,7 +227,7 @@ static func create_ui_for_shader_uniforms(
 				var mod_button := Button.new()
 				mod_button.text = "Modify"
 				mod_button.pressed.connect(
-					func(): Global.modify_texture_resource(
+					func(): _modify_texture_resource(
 						_get_loaded_texture(params, u_name),
 						u_name,
 						_shader_update_texture.bind(value_changed, u_name)
@@ -373,3 +373,14 @@ static func _shader_update_texture(
 	value_changed.call(ImageTexture.create_from_image(updated_image), parameter_name)
 	if not warnings.is_empty():
 		Global.popup_error(warnings)
+
+
+static func _modify_texture_resource(image: Image, resource_name: StringName, update_callable: Callable):
+	var resource_proj = ResourceProject.new([], resource_name, image.get_size())
+	resource_proj.layers.append(PixelLayer.new(resource_proj))
+	resource_proj.frames.append(resource_proj.new_empty_frame())
+	resource_proj.frames[0].cels[0].set_content(image)
+	resource_proj.resource_updated.connect(update_callable)
+	Global.projects.append(resource_proj)
+	Global.tabs.current_tab = Global.tabs.get_tab_count() - 1
+	Global.canvas.camera_zoom()

src/Shaders/Effects/IndexMap.gdshader

@@ -3,6 +3,7 @@ shader_type canvas_item;
 render_mode unshaded;
 
 uniform sampler2D map_texture : filter_nearest;  // The map texture
+uniform bool alpha = false;
 
 // (begin DESCRIPTION)
 // The Red and Green values (0-255) of tool color will be treated as an x and y position
@@ -14,5 +15,8 @@ void fragment(){
 	vec2 map_size = vec2(textureSize(map_texture, 0));
 	vec2 lookup_uv = vec2(round(col.x * 255.0)/(map_size.x), round(col.y * 255.0)/(map_size.y));
 	vec4 index_color = texture(map_texture, lookup_uv);
-	COLOR = index_color;
+	COLOR.rgb = index_color.rgb;
+	if (alpha) {
+		COLOR.a = index_color.a;
+	}
 }

src/UI/Timeline/CelButton.tscn

@@ -59,7 +59,7 @@ grow_vertical = 2
 size_flags_horizontal = 0
 size_flags_vertical = 0
 expand_mode = 1
-stretch_mode = 6
+stretch_mode = 5
 
 [node name="TransparentChecker" parent="CelTexture" instance=ExtResource("2_mi8wp")]
 show_behind_parent = true