Jelajahi Sumber

Merge pull request #83145 from bitsawer/fix_basematerial3d_update

Fix BaseMaterial3D update with certain material settings
Rémi Verschelde 1 tahun lalu
induk
melakukan
05d6183dee
2 mengubah file dengan 3 tambahan dan 0 penghapusan
  1. 2 0
      scene/resources/material.cpp
  2. 1 0
      scene/resources/material.h

+ 2 - 0
scene/resources/material.cpp

@@ -3079,6 +3079,8 @@ BaseMaterial3D::BaseMaterial3D(bool p_orm) :
 	flags[FLAG_ALBEDO_TEXTURE_MSDF] = false;
 	flags[FLAG_ALBEDO_TEXTURE_MSDF] = false;
 	flags[FLAG_USE_TEXTURE_REPEAT] = true;
 	flags[FLAG_USE_TEXTURE_REPEAT] = true;
 
 
+	current_key.invalid_key = 1;
+
 	_mark_initialized(callable_mp(this, &BaseMaterial3D::_queue_shader_change));
 	_mark_initialized(callable_mp(this, &BaseMaterial3D::_queue_shader_change));
 }
 }
 
 

+ 1 - 0
scene/resources/material.h

@@ -325,6 +325,7 @@ private:
 		uint64_t emission_op : get_num_bits(EMISSION_OP_MAX - 1);
 		uint64_t emission_op : get_num_bits(EMISSION_OP_MAX - 1);
 		uint64_t distance_fade : get_num_bits(DISTANCE_FADE_MAX - 1);
 		uint64_t distance_fade : get_num_bits(DISTANCE_FADE_MAX - 1);
 		// booleans
 		// booleans
+		uint64_t invalid_key : 1;
 		uint64_t deep_parallax : 1;
 		uint64_t deep_parallax : 1;
 		uint64_t grow : 1;
 		uint64_t grow : 1;
 		uint64_t proximity_fade : 1;
 		uint64_t proximity_fade : 1;