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/visual_instance.cpp | |
| parent | 324e5a60dd068cbbff9c433802f8ecb78cff3364 (diff) | |
| parent | 475e4ea67b7e650fd1df01eab6ea659afbc16ec5 (diff) | |
| download | redot-engine-620030b600b375545ecab5190615e08919e56da4.tar.gz | |
Merge pull request #36640 from reduz/resource-loader-refactor
Removed ResourceInteractiveLoader, add built-in threaded loading.
Diffstat (limited to 'scene/3d/visual_instance.cpp')
| -rw-r--r-- | scene/3d/visual_instance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp index 73cffe9c89..105ce9ca74 100644 --- a/scene/3d/visual_instance.cpp +++ b/scene/3d/visual_instance.cpp @@ -294,7 +294,7 @@ void GeometryInstance::_bind_methods() { ClassDB::bind_method(D_METHOD("get_aabb"), &GeometryInstance::get_aabb); ADD_GROUP("Geometry", ""); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material_override", PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial,StandardMaterial3D"), "set_material_override", "get_material_override"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material_override", PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial,StandardMaterial3D", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_DEFERRED_SET_RESOURCE), "set_material_override", "get_material_override"); ADD_PROPERTY(PropertyInfo(Variant::INT, "cast_shadow", PROPERTY_HINT_ENUM, "Off,On,Double-Sided,Shadows Only"), "set_cast_shadows_setting", "get_cast_shadows_setting"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "extra_cull_margin", PROPERTY_HINT_RANGE, "0,16384,0.01"), "set_extra_cull_margin", "get_extra_cull_margin"); ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "use_in_baked_light"), "set_flag", "get_flag", FLAG_USE_BAKED_LIGHT); |