godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83145 from bitsawer/fix_basematerial3d_update 

Fix BaseMaterial3D update with certain material settings
This commit is contained in:
Rémi Verschelde 2023-10-11 18:31:06 +02:00
parent ae5be1f9af 45f2ef4c0f
commit 05d6183dee
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/material.cpp
View File

@ -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
scene/resources/material.h
View File

@ -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;