diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-28 17:21:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 17:21:16 +0100 |
| commit | 620030b600b375545ecab5190615e08919e56da4 (patch) | |
| tree | 0ca3e64b0da0edf3d4b1fd14ed558311dd9041e4 /scene/3d/mesh_instance.cpp | |
| parent | 324e5a60dd068cbbff9c433802f8ecb78cff3364 (diff) | |
| parent | 475e4ea67b7e650fd1df01eab6ea659afbc16ec5 (diff) | |
Merge pull request #36640 from reduz/resource-loader-refactor
Removed ResourceInteractiveLoader, add built-in threaded loading.
Diffstat (limited to 'scene/3d/mesh_instance.cpp')
| -rw-r--r-- | scene/3d/mesh_instance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index a48d148d33..4ca139ebbc 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -100,7 +100,7 @@ void MeshInstance::_get_property_list(List<PropertyInfo> *p_list) const { if (mesh.is_valid()) { for (int i = 0; i < mesh->get_surface_count(); i++) { - p_list->push_back(PropertyInfo(Variant::OBJECT, "material/" + itos(i), PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial,StandardMaterial3D")); + p_list->push_back(PropertyInfo(Variant::OBJECT, "material/" + itos(i), PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial,StandardMaterial3D", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_DEFERRED_SET_RESOURCE)); } } } |