summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-12-21 09:43:26 +0100
committerGitHub <noreply@github.com>2021-12-21 09:43:26 +0100
commit011c0279c50cfcd96f4cde9aff017cab6da4a5bd (patch)
treed6189fd9a7ab7e5ef7ae63624f0127a5e16f6a63 /editor
parent4a58c0895556341d7c01e758ca90e0be1b32612b (diff)
parentf491b43edde841fa0c264d617284ac5f155badd8 (diff)
Merge pull request #56102 from jmb462/fix-wrong-gradientedit-colorpicker-shape
Diffstat (limited to 'editor')
-rw-r--r--editor/plugins/gradient_editor_plugin.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/editor/plugins/gradient_editor_plugin.cpp b/editor/plugins/gradient_editor_plugin.cpp
index da050abc02..6f2d950190 100644
--- a/editor/plugins/gradient_editor_plugin.cpp
+++ b/editor/plugins/gradient_editor_plugin.cpp
@@ -118,6 +118,9 @@ void EditorInspectorPluginGradient::parse_begin(Object *p_object) {
editor->set_gradient(g);
add_custom_control(editor);
+ int picker_shape = EDITOR_GET("interface/inspector/default_color_picker_shape");
+ editor->get_picker()->set_picker_shape((ColorPicker::PickerShapeType)picker_shape);
+
reverse_btn = memnew(GradientReverseButton);
gradient_tools_hbox = memnew(HBoxContainer);