diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-22 23:46:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 23:46:27 +0200 |
| commit | e5df1e65f935ba2df73c9f53d930d4a9cec554fc (patch) | |
| tree | 54ca25e53f4721db2a994c9a829e4b5ed1b5d1b3 /editor/property_editor.cpp | |
| parent | 4f7bfacfcd65ab630f4e3f476d3f0ff12494a0b3 (diff) | |
| parent | 1b8652e86a383747cc2d8ec803b4dcd49cb7469d (diff) | |
Merge pull request #62581 from Guh-Feng/Color-Picker-Update
Diffstat (limited to 'editor/property_editor.cpp')
| -rw-r--r-- | editor/property_editor.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 0693294316..488a084903 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -828,13 +828,7 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: value_vbox->add_child(color_picker); color_picker->hide(); color_picker->connect("color_changed", callable_mp(this, &CustomPropertyEditor::_color_changed)); - - // get default color picker mode from editor settings - int default_color_mode = EDITOR_GET("interface/inspector/default_color_picker_mode"); - color_picker->set_color_mode((ColorPicker::ColorModeType)default_color_mode); - - int picker_shape = EDITOR_GET("interface/inspector/default_color_picker_shape"); - color_picker->set_picker_shape((ColorPicker::PickerShapeType)picker_shape); + color_picker->connect("show", callable_mp(EditorNode::get_singleton(), &EditorNode::setup_color_picker), varray(color_picker)); } color_picker->show(); |