diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-21 13:52:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-21 13:52:57 +0200 |
| commit | 91960b7b81523cb545b2dfb47c235cf21dd460f3 (patch) | |
| tree | 6812efcb8a4736e89e2b8a84a22bf30cfff302d1 /scene/resources/material.cpp | |
| parent | 8085affdb109123f68059e37beb2236a1f94de1a (diff) | |
| parent | dbe757102c6503eb564c9edc699c89afe63b91cd (diff) | |
| download | redot-engine-91960b7b81523cb545b2dfb47c235cf21dd460f3.tar.gz | |
Merge pull request #52466 from tcoxon/fix_43733_4.0
Prevent shaders from generating code before the constructor finishes.
Diffstat (limited to 'scene/resources/material.cpp')
| -rw-r--r-- | scene/resources/material.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 643b0e34b9..3a6af3afb0 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -1301,7 +1301,7 @@ void BaseMaterial3D::flush_changes() { void BaseMaterial3D::_queue_shader_change() { MutexLock lock(material_mutex); - if (!element.in_list()) { + if (is_initialized && !element.in_list()) { dirty_materials->add(&element); } } @@ -2777,6 +2777,7 @@ BaseMaterial3D::BaseMaterial3D(bool p_orm) : flags[FLAG_USE_TEXTURE_REPEAT] = true; + is_initialized = true; _queue_shader_change(); } |