diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-23 11:21:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-23 11:21:14 +0200 |
commit | a5bc65bbadad814a157283749c1ef8552f1663c4 (patch) | |
tree | 02726cac4b18989faf21a50b92998f9031f0ddcd /editor/editor_properties.cpp | |
parent | 01c866a5993d78d414b81836eec4051c27444b08 (diff) | |
parent | d1ddee225830b28171de031bd1f1918ced21b38f (diff) | |
download | redot-engine-a5bc65bbadad814a157283749c1ef8552f1663c4.tar.gz |
Merge pull request #63265 from reduz/stream-bpm-support
Implement BPM support in AudioStream files.
Diffstat (limited to 'editor/editor_properties.cpp')
-rw-r--r-- | editor/editor_properties.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 808e11e337..e9354927c8 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -3514,6 +3514,9 @@ void EditorPropertyResource::setup(Object *p_object, const String &p_path, const shader_picker->set_edited_material(Object::cast_to<ShaderMaterial>(p_object)); resource_picker = shader_picker; connect(SNAME("ready"), callable_mp(this, &EditorPropertyResource::_update_preferred_shader)); + } else if (p_base_type == "AudioStream") { + EditorAudioStreamPicker *astream_picker = memnew(EditorAudioStreamPicker); + resource_picker = astream_picker; } else { resource_picker = memnew(EditorResourcePicker); } |