asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #82093 from jsjtxietian/add-support-for-drag-a-shader-to-material

Browse source 
Add support for dragging a shader to user exported material property
This commit is contained in:
Rémi Verschelde 2024-08-20 10:01:19 +02:00
commit 7f8b4364e8
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/editor_resource_picker.cpp
View file

@ -618,9 +618,9 @@ void EditorResourcePicker::_ensure_allowed_types() const {
const String base = allowed_types[i].strip_edges(); const String base = allowed_types[i].strip_edges();
if (base == "BaseMaterial3D") { if (base == "BaseMaterial3D") {
allowed_types_with_convert.insert("Texture2D"); allowed_types_with_convert.insert("Texture2D");
} else if (base == "ShaderMaterial") { } else if (ClassDB::is_parent_class("ShaderMaterial", base)) {
allowed_types_with_convert.insert("Shader"); allowed_types_with_convert.insert("Shader");
} else if (base == "Texture2D") { } else if (ClassDB::is_parent_class("ImageTexture", base)) {
allowed_types_with_convert.insert("Image"); allowed_types_with_convert.insert("Image");
} }
} }