diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-06 22:56:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 22:56:06 +0200 |
| commit | fa90b6e285b955d931267efbb8f58f9e927bb438 (patch) | |
| tree | ed90cfa63af0fb52c6ebcc1905bd79bf1ac2a7f5 /scene/resources/primitive_meshes.cpp | |
| parent | 86b215516dd4368431d0e17766378dbb3f2ca8cc (diff) | |
| parent | 8f7e1b53ff193e23c3572ac2f4721caeb10fc3ed (diff) | |
Merge pull request #50162 from Calinou/inspector-hint-allow-ormmaterial3d
Allow using ORMMaterial3D by using BaseMaterial3D as a resource hint
Diffstat (limited to 'scene/resources/primitive_meshes.cpp')
| -rw-r--r-- | scene/resources/primitive_meshes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp index 2b2ebb5c16..cc3346d182 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -207,7 +207,7 @@ void PrimitiveMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("set_flip_faces", "flip_faces"), &PrimitiveMesh::set_flip_faces); ClassDB::bind_method(D_METHOD("get_flip_faces"), &PrimitiveMesh::get_flip_faces); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial,StandardMaterial3D"), "set_material", "get_material"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "BaseMaterial3D,ShaderMaterial"), "set_material", "get_material"); ADD_PROPERTY(PropertyInfo(Variant::AABB, "custom_aabb", PROPERTY_HINT_NONE, ""), "set_custom_aabb", "get_custom_aabb"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flip_faces"), "set_flip_faces", "get_flip_faces"); } |