From 4c2247c401280d0992817735ac2eb9bf353caa7a Mon Sep 17 00:00:00 2001 From: Cory Petkovsek <632766+TokisanGames@users.noreply.github.com> Date: Thu, 15 Aug 2024 22:00:32 +0700 Subject: [PATCH] Fix setting default editor setting for color pickers on label click --- project/addons/terrain_3d/src/tool_settings.gd | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/project/addons/terrain_3d/src/tool_settings.gd b/project/addons/terrain_3d/src/tool_settings.gd index 98c35421..ceb0fc6d 100644 --- a/project/addons/terrain_3d/src/tool_settings.gd +++ b/project/addons/terrain_3d/src/tool_settings.gd @@ -367,7 +367,6 @@ func add_setting(p_args: Dictionary) -> void: func(value, path): plugin.set_setting(path, value) ).bind(ES_TOOL_SETTINGS + p_name) ) - checkbox.pressed.connect(_on_setting_changed) pending_children.push_back(checkbox) control = checkbox @@ -553,6 +552,7 @@ func set_setting(p_setting: String, p_value: Variant) -> void: object.button_pressed = p_value elif object is ColorPickerButton: object.color = p_value + plugin.set_setting(ES_TOOL_SETTINGS + p_setting, p_value) # Signal doesn't fire on CPB elif object is MultiPicker: # Expects p_value is PackedVector3Array object.points = p_value _on_setting_changed(object) @@ -578,13 +578,12 @@ func _on_setting_changed(p_data: Variant = null) -> void: if p_data is Button and p_data.get_parent().get_parent() is PopupPanel: if p_data.get_parent().name == "BrushList": # Optionally Set selected brush texture in main brush button -# p_data.get_parent().get_parent().get_parent().set_button_icon(p_data.get_button_icon()) + # p_data.get_parent().get_parent().get_parent().set_button_icon(p_data.get_button_icon()) # Hide popup p_data.get_parent().get_parent().set_visible(false) # Hide label if p_data.get_child_count() > 0: p_data.get_child(0).visible = false - emit_signal("setting_changed") @@ -597,7 +596,6 @@ func _get_brush_preview_material() -> ShaderMaterial: if !brush_preview_material: brush_preview_material = ShaderMaterial.new() var shader: Shader = Shader.new() - var code: String = "shader_type canvas_item;\n" code += "varying vec4 v_vertex_color;\n" code += "void vertex() {\n" @@ -608,13 +606,11 @@ func _get_brush_preview_material() -> ShaderMaterial: code += " COLOR.a *= pow(tex.r, 0.666);\n" code += " COLOR.rgb = v_vertex_color.rgb;\n" code += "}\n" - shader.set_code(code) brush_preview_material.set_shader(shader) return brush_preview_material - # Counts digits of a number including negative sign, decimal points, and up to 3 decimals func count_digits(p_value: float) -> int: var count: int = 1