Merge pull request #52475 from tcoxon/fix_43733_3.x

Prevent shaders from generating code before the constructor finishes. [3.x]
godotengine · Sep 21, 2021 · be6b7b4 · be6b7b4
2 parents 22aab6b + 9e9bac1
commit be6b7b4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp
@@ -176,7 +176,7 @@ void CanvasItemMaterial::flush_changes() {
 void CanvasItemMaterial::_queue_shader_change() {
 	material_mutex.lock();
 
-	if (!element.in_list()) {
+	if (is_initialized && !element.in_list()) {
 		dirty_materials->add(&element);
 	}
 
@@ -313,6 +313,7 @@ CanvasItemMaterial::CanvasItemMaterial() :
 
 	current_key.key = 0;
 	current_key.invalid_key = 1;
+	is_initialized = true;
 	_queue_shader_change();
 }
 

diff --git a/scene/2d/canvas_item.h b/scene/2d/canvas_item.h
@@ -113,6 +113,7 @@ class CanvasItemMaterial : public Material {
 	_FORCE_INLINE_ void _queue_shader_change();
 	_FORCE_INLINE_ bool _is_shader_dirty() const;
 
+	bool is_initialized = false;
 	BlendMode blend_mode;
 	LightMode light_mode;
 	bool particles_animation;

diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
@@ -1073,7 +1073,7 @@ void SpatialMaterial::flush_changes() {
 void SpatialMaterial::_queue_shader_change() {
 	material_mutex.lock();
 
-	if (!element.in_list()) {
+	if (is_initialized && !element.in_list()) {
 		dirty_materials->add(&element);
 	}
 
@@ -2317,6 +2317,7 @@ SpatialMaterial::SpatialMaterial() :
 
 	current_key.key = 0;
 	current_key.invalid_key = 1;
+	is_initialized = true;
 	_queue_shader_change();
 }
 

diff --git a/scene/resources/material.h b/scene/resources/material.h
@@ -366,6 +366,7 @@ class SpatialMaterial : public Material {
 	_FORCE_INLINE_ void _queue_shader_change();
 	_FORCE_INLINE_ bool _is_shader_dirty() const;
 
+	bool is_initialized = false;
 	Color albedo;
 	float specular;
 	float metallic;

diff --git a/scene/resources/particles_material.cpp b/scene/resources/particles_material.cpp
@@ -690,7 +690,7 @@ void ParticlesMaterial::flush_changes() {
 void ParticlesMaterial::_queue_shader_change() {
 	material_mutex.lock();
 
-	if (!element.in_list()) {
+	if (is_initialized && !element.in_list()) {
 		dirty_materials->add(&element);
 	}
 
@@ -1367,6 +1367,7 @@ ParticlesMaterial::ParticlesMaterial() :
 	current_key.key = 0;
 	current_key.invalid_key = 1;
 
+	is_initialized = true;
 	_queue_shader_change();
 }
 

diff --git a/scene/resources/particles_material.h b/scene/resources/particles_material.h
@@ -203,6 +203,7 @@ class ParticlesMaterial : public Material {
 	_FORCE_INLINE_ void _queue_shader_change();
 	_FORCE_INLINE_ bool _is_shader_dirty() const;
 
+	bool is_initialized = false;
 	Vector3 direction;
 	float spread;
 	float flatness;