noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #62075 from Vitika9/gsoc-colorpicker

Browse Source
This commit is contained in:
Rémi Verschelde
2022-07-08 09:06:47 +02:00
committed by GitHub
parent 2b6dadd46b 0011d93c81
commit 7d3ff927de
9 changed files with 788 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
editor/editor_properties.cpp
View File

@@ -3010,12 +3010,7 @@ void EditorPropertyColor::_popup_closed() {
void EditorPropertyColor::_picker_created() {
// get default color picker mode from editor settings
int default_color_mode = EDITOR_GET("interface/inspector/default_color_picker_mode");
if (default_color_mode == 1) {
picker->get_picker()->set_hsv_mode(true);
} else if (default_color_mode == 2) {
picker->get_picker()->set_raw_mode(true);
}
picker->get_picker()->set_color_mode((ColorPicker::ColorModeType)default_color_mode);
int picker_shape = EDITOR_GET("interface/inspector/default_color_picker_shape");
picker->get_picker()->set_picker_shape((ColorPicker::PickerShapeType)picker_shape);
}