Skip to content

Commit cbed98c

Browse files
committed
Merge pull request godotengine#110160 from WhalesState/cp-intensity
Fix ColorPicker after adding intensity sliders.
2 parents 7e88218 + 5412885 commit cbed98c

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

editor/editor_node.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4308,7 +4308,7 @@ void EditorNode::setup_color_picker(ColorPicker *p_picker) {
43084308
p_picker->set_editor_settings(EditorSettings::get_singleton());
43094309
int default_color_mode = EditorSettings::get_singleton()->get_project_metadata("color_picker", "color_mode", EDITOR_GET("interface/inspector/default_color_picker_mode"));
43104310
int picker_shape = EditorSettings::get_singleton()->get_project_metadata("color_picker", "picker_shape", EDITOR_GET("interface/inspector/default_color_picker_shape"));
4311-
bool show_intensity = EditorSettings::get_singleton()->get_project_metadata("color_picker", "show_intensity", EDITOR_GET("interface/inspector/color_picker_show_intensity"));
4311+
bool show_intensity = EDITOR_GET("interface/inspector/color_picker_show_intensity");
43124312

43134313
p_picker->set_color_mode((ColorPicker::ColorModeType)default_color_mode);
43144314
p_picker->set_picker_shape((ColorPicker::PickerShapeType)picker_shape);

scene/gui/color_picker.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -972,6 +972,7 @@ void ColorPicker::set_picker_shape(PickerShapeType p_shape) {
972972
}
973973
#endif
974974

975+
_copy_normalized_to_hsv_okhsl();
975976
_update_controls();
976977
_update_color();
977978
}

0 commit comments

Comments
 (0)