Skip to content

Allow dragging from shader editor to material #113748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Repiteo merged 1 commit into from
Jan 27, 2026
Merged

Allow dragging from shader editor to material #113748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 42 additions & 52 deletions editor/inspector/editor_resource_picker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,45 +843,26 @@ bool EditorResourcePicker::_is_drop_valid(const Dictionary &p_drag_data) const {
return true;
}

Dictionary drag_data = p_drag_data;

Ref<Resource> res;
if (drag_data.has("type") && String(drag_data["type"]) == "script_list_element") {
ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]);
if (se) {
res = se->get_edited_resource();
}
} else if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
res = drag_data["resource"];
} else if (drag_data.has("type") && String(drag_data["type"]) == "files") {
Vector<String> files = drag_data["files"];

if (files.size() == 1) {
if (ResourceLoader::exists(files[0])) {
// TODO: Extract the typename of the dropped filepath's resource in a more performant way, without fully loading it.
res = ResourceLoader::load(files[0]);
}
}
Ref<Resource> res = _get_dropped_resource(p_drag_data);
if (res.is_null()) {
return false;
}

_ensure_allowed_types();
HashSet<StringName> allowed_types = allowed_types_with_convert;

if (res.is_valid()) {
String res_type = _get_resource_type(res);
String res_type = _get_resource_type(res);

if (_is_type_valid(res_type, allowed_types)) {
return true;
}
if (_is_type_valid(res_type, allowed_types)) {
return true;
}

if (res->get_script()) {
StringName custom_class = EditorNode::get_singleton()->get_object_custom_type_name(res->get_script());
if (_is_type_valid(custom_class, allowed_types)) {
return true;
}
if (res->get_script()) {
StringName custom_class = EditorNode::get_singleton()->get_object_custom_type_name(res->get_script());
if (_is_type_valid(custom_class, allowed_types)) {
return true;
}
}

return false;
}

Expand Down Expand Up @@ -915,6 +896,36 @@ bool EditorResourcePicker::_is_custom_type_script() const {
return false;
}

Ref<Resource> EditorResourcePicker::_get_dropped_resource(const Variant &p_data) const {
Dictionary drag_data = p_data;
const String type = drag_data.get("type", "");
if (type.is_empty()) {
return Ref<Resource>();
}

Ref<Resource> res;
if (type == "script_list_element") {
ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]);
if (se) {
return se->get_edited_resource();
}
} else if (type == "shader_list_element") {
return ResourceCache::get_ref(drag_data["file_path"]);
} else if (type == "resource") {
return drag_data["resource"];
} else if (type == "files") {
Vector<String> files = drag_data["files"];

if (files.size() == 1) {
if (ResourceLoader::exists(files[0])) {
// TODO: Extract the typename of the dropped filepath's resource in a more performant way, without fully loading it.
return ResourceLoader::load(files[0]);
}
}
}
return Ref<Resource>();
}

Variant EditorResourcePicker::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
if (edited_resource.is_valid()) {
Dictionary drag_data = EditorNode::get_singleton()->drag_resource(edited_resource, p_from);
Expand All @@ -930,28 +941,7 @@ bool EditorResourcePicker::can_drop_data_fw(const Point2 &p_point, const Variant
}

void EditorResourcePicker::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
ERR_FAIL_COND(!_is_drop_valid(p_data));

Dictionary drag_data = p_data;

Ref<Resource> dropped_resource;
if (drag_data.has("type") && String(drag_data["type"]) == "script_list_element") {
ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]);
if (se) {
dropped_resource = se->get_edited_resource();
}
} else if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
dropped_resource = drag_data["resource"];
}

if (dropped_resource.is_null() && drag_data.has("type") && String(drag_data["type"]) == "files") {
Vector<String> files = drag_data["files"];

if (files.size() == 1) {
dropped_resource = ResourceLoader::load(files[0]);
}
}

Ref<Resource> dropped_resource = _get_dropped_resource(p_data);
if (dropped_resource.is_valid()) {
_ensure_allowed_types();
HashSet<StringName> allowed_types = allowed_types_without_convert;
Expand Down
1 change: 1 addition & 0 deletions editor/inspector/editor_resource_picker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ class EditorResourcePicker : public HBoxContainer {
bool _is_drop_valid(const Dictionary &p_drag_data) const;
bool _is_type_valid(const String &p_type_name, const HashSet<StringName> &p_allowed_types) const;
bool _is_custom_type_script() const;
Ref<Resource> _get_dropped_resource(const Variant &p_data) const;

Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
Expand Down
6 changes: 6 additions & 0 deletions editor/shader/shader_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,12 @@ Variant ShaderEditorPlugin::get_drag_data_fw(const Point2 &p_point, Control *p_f
drag_data["type"] = "shader_list_element";
drag_data["shader_list_element"] = idx;

Ref<Resource> shader = edited_shaders[idx].shader;
if (shader.is_null()) {
shader = edited_shaders[idx].shader_inc;
}
drag_data["file_path"] = shader->get_path();

return drag_data;
}

Expand Down