Skip to content

Commit d587e76

Browse files
committed
Merge pull request godotengine#82093 from jsjtxietian/add-support-for-drag-a-shader-to-material
Add support for dragging a shader to user exported material property
2 parents 3ab879f + 100b5ac commit d587e76

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

editor/editor_resource_picker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,9 +618,9 @@ void EditorResourcePicker::_ensure_allowed_types() const {
618618
const String base = allowed_types[i].strip_edges();
619619
if (base == "BaseMaterial3D") {
620620
allowed_types_with_convert.insert("Texture2D");
621-
} else if (base == "ShaderMaterial") {
621+
} else if (ClassDB::is_parent_class("ShaderMaterial", base)) {
622622
allowed_types_with_convert.insert("Shader");
623-
} else if (base == "Texture2D") {
623+
} else if (ClassDB::is_parent_class("ImageTexture", base)) {
624624
allowed_types_with_convert.insert("Image");
625625
}
626626
}

0 commit comments

Comments
 (0)