diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-06-03 22:47:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 22:47:55 +0200 |
| commit | 1a5d472be5a3afda6713602707244767b08b5f35 (patch) | |
| tree | 7cc504f56f990f4ffdc02ed76071dfa1b394e2c7 /scene/resources/primitive_meshes.cpp | |
| parent | 176e6a0be3552b682577d3ac227fd068dce80b49 (diff) | |
| parent | 2fc274d572d89a3d40ff5a715a6cc553b54af61f (diff) | |
Merge pull request #39270 from Phischermen/fix-mesh-property-list
Update property hint from ArrayMesh to be consistent with other property hints
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 99edf26dc1..8d9c5f07b2 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -204,7 +204,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, "StandardMaterial3D,ShaderMaterial"), "set_material", "get_material"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial,StandardMaterial3D"), "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"); } |