godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Merge pull request #67253 from KoBeWi/PICKER_USAGE_NO_EDITOR

Browse Source 
Remove editor dependencies from ColorPicker
This commit is contained in:
Rémi Verschelde
2023-01-21 20:52:16 +01:00
parent 229c82690d a3661ad079
commit 906ee0b219
4 changed files with 57 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
editor/editor_node.cpp
View File

@@ -3712,11 +3712,12 @@ void EditorNode::set_current_scene(int p_idx) {
call_deferred(SNAME("_set_main_scene_state"), state, get_edited_scene()); // Do after everything else is done setting up.
}
void EditorNode::setup_color_picker(ColorPicker *picker) {
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");
picker->set_color_mode((ColorPicker::ColorModeType)default_color_mode);
picker->set_picker_shape((ColorPicker::PickerShapeType)picker_shape);
p_picker->set_color_mode((ColorPicker::ColorModeType)default_color_mode);
p_picker->set_picker_shape((ColorPicker::PickerShapeType)picker_shape);
}
bool EditorNode::is_scene_open(const String &p_path) {