summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2022-10-07 22:21:22 +0200
committerRémi Verschelde <rverschelde@gmail.com>2022-10-07 22:21:22 +0200
commit301bf9fa365fa730fe64ec4b5fa000b27a9aa75f (patch)
treeb84bf2427abbf494b497b569d00f3662a750d5f6
parent1baefceababe8a0d63434a231c3799555a45d8e3 (diff)
parent74654550793c27911898fe938bc172c64cfa689a (diff)
downloadredot-engine-301bf9fa365fa730fe64ec4b5fa000b27a9aa75f.tar.gz
Merge pull request #67042 from clayjohn/overlay-shadow-bug
Fix material overlay overriding shadow casting logic
-rw-r--r--servers/rendering/renderer_scene_cull.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/rendering/renderer_scene_cull.cpp b/servers/rendering/renderer_scene_cull.cpp
index 66a64d4372..2b25e8962f 100644
--- a/servers/rendering/renderer_scene_cull.cpp
+++ b/servers/rendering/renderer_scene_cull.cpp
@@ -3862,7 +3862,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) {
}
if (p_instance->material_overlay.is_valid()) {
- can_cast_shadows = can_cast_shadows || RSG::material_storage->material_casts_shadows(p_instance->material_overlay);
+ can_cast_shadows = can_cast_shadows && RSG::material_storage->material_casts_shadows(p_instance->material_overlay);
is_animated = is_animated || RSG::material_storage->material_is_animated(p_instance->material_overlay);
_update_instance_shader_uniforms_from_material(isparams, p_instance->instance_shader_uniforms, p_instance->material_overlay);
}