summaryrefslogtreecommitdiffstats
path: root/editor/editor_resource_picker.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-11-03 16:33:50 +0100
committerGitHub <noreply@github.com>2021-11-03 16:33:50 +0100
commitbbee1939579bc5f359af149068cb1e3385038d55 (patch)
treedc25418805f607ab37a7dd55d415848545b92c0c /editor/editor_resource_picker.cpp
parent300286ea088227c0f54aa4e0944a50db53c1bef6 (diff)
parent07065d67e12d2fb0923c3fc892234a9142f9c9e6 (diff)
downloadredot-engine-bbee1939579bc5f359af149068cb1e3385038d55.tar.gz
Merge pull request #52781 from KoBeWi/node's_favorite_shader
Diffstat (limited to 'editor/editor_resource_picker.cpp')
-rw-r--r--editor/editor_resource_picker.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp
index a2d11c4b1f..f05c401f1d 100644
--- a/editor/editor_resource_picker.cpp
+++ b/editor/editor_resource_picker.cpp
@@ -934,7 +934,7 @@ bool EditorShaderPicker::handle_menu_selected(int p_which) {
switch (p_which) {
case OBJ_MENU_NEW_SHADER: {
if (material.is_valid()) {
- EditorNode::get_singleton()->get_scene_tree_dock()->open_shader_dialog(material);
+ EditorNode::get_singleton()->get_scene_tree_dock()->open_shader_dialog(material, preferred_mode);
return true;
}
} break;
@@ -952,5 +952,9 @@ ShaderMaterial *EditorShaderPicker::get_edited_material() const {
return edited_material;
}
+void EditorShaderPicker::set_preferred_mode(int p_mode) {
+ preferred_mode = p_mode;
+}
+
EditorShaderPicker::EditorShaderPicker() {
}