diff options
| author | Yuri Sizov <yuris@humnom.net> | 2023-12-14 21:22:39 +0100 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2023-12-14 21:22:39 +0100 |
| commit | a5529f759c2907746e39d10d9ebf6b352a9a59e4 (patch) | |
| tree | 483b8791e2b2598682a4ac5855a94e73b00b2571 /editor/editor_node.cpp | |
| parent | 302e41c26478b72171226244ae57122581cdd880 (diff) | |
| parent | 7979412c7566b327748a622f5679369469baba08 (diff) | |
| download | redot-engine-a5529f759c2907746e39d10d9ebf6b352a9a59e4.tar.gz | |
Merge pull request #86129 from TheSofox/color-picker-memory
Remember last `color_mode` and `picker_shape` in `ColorPicker`s in the editor
Diffstat (limited to 'editor/editor_node.cpp')
| -rw-r--r-- | editor/editor_node.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 52ca1cf25c..52f432135e 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -3701,8 +3701,9 @@ void EditorNode::_set_current_scene_nocheck(int p_idx) { void EditorNode::setup_color_picker(ColorPicker *p_picker) { p_picker->set_editor_settings(EditorSettings::get_singleton()); - int default_color_mode = EDITOR_GET("interface/inspector/default_color_picker_mode"); - int picker_shape = EDITOR_GET("interface/inspector/default_color_picker_shape"); + int default_color_mode = EditorSettings::get_singleton()->get_project_metadata("color_picker", "color_mode", EDITOR_GET("interface/inspector/default_color_picker_mode")); + int picker_shape = EditorSettings::get_singleton()->get_project_metadata("color_picker", "picker_shape", EDITOR_GET("interface/inspector/default_color_picker_shape")); + p_picker->set_color_mode((ColorPicker::ColorModeType)default_color_mode); p_picker->set_picker_shape((ColorPicker::PickerShapeType)picker_shape); } |