diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-07 20:52:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-07 20:52:32 +0200 |
| commit | d52a79ad2288f815f935f40a089b5fe0887188a6 (patch) | |
| tree | 6ce9c2bd823999d92b5e51f91b787a4e170da2d4 /editor | |
| parent | 28cf97746f7fbf3e2bf6bb96c1b48a72f2d738d2 (diff) | |
| parent | 1b776a6e7a5046d337933f8504699d1c4244289e (diff) | |
Merge pull request #59786 from V-Sekai/ok_color
Allow picking similar colours using OKHSL.
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_node.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index c59c7de603..e23c36c1d4 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -6109,8 +6109,8 @@ EditorNode::EditorNode() { EDITOR_DEF("interface/inspector/resources_to_open_in_new_inspector", "Script,MeshLibrary"); EDITOR_DEF("interface/inspector/default_color_picker_mode", 0); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "interface/inspector/default_color_picker_mode", PROPERTY_HINT_ENUM, "RGB,HSV,RAW", PROPERTY_USAGE_DEFAULT)); - EDITOR_DEF("interface/inspector/default_color_picker_shape", (int32_t)ColorPicker::SHAPE_VHS_CIRCLE); - EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "interface/inspector/default_color_picker_shape", PROPERTY_HINT_ENUM, "HSV Rectangle,HSV Rectangle Wheel,VHS Circle", PROPERTY_USAGE_DEFAULT)); + EDITOR_DEF("interface/inspector/default_color_picker_shape", (int32_t)ColorPicker::SHAPE_OKHSL_CIRCLE); + EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "interface/inspector/default_color_picker_shape", PROPERTY_HINT_ENUM, "HSV Rectangle,HSV Rectangle Wheel,VHS Circle,OKHSL Circle", PROPERTY_USAGE_DEFAULT)); ED_SHORTCUT("canvas_item_editor/pan_view", TTR("Pan View"), Key::SPACE); |