diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-12-06 19:06:18 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-12-06 19:07:17 -0300 |
| commit | 86fcc39fa94da2c693d7975ccab2401c5c5f377b (patch) | |
| tree | 513d477ff6fa74ab76eef94f59b7c57d41b596ff /scene | |
| parent | 820cdb46fd494ad0dece6efbb0e81dc57458bae3 (diff) | |
| download | redot-engine-86fcc39fa94da2c693d7975ccab2401c5c5f377b.tar.gz | |
Fix and rewrite folding logic, closes #14005, closes #13421
Diffstat (limited to 'scene')
| -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 3b80db291c..2e8f9cbb33 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -164,7 +164,7 @@ void PrimitiveMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("get_mesh_arrays"), &PrimitiveMesh::get_mesh_arrays); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "Material"), "set_material", "get_material"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "SpatialMaterial,ShaderMaterial"), "set_material", "get_material"); } void PrimitiveMesh::set_material(const Ref<Material> &p_material) { |