diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-15 21:26:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 21:26:08 +0200 |
| commit | 3c1218a39a3cd4311812e7219d20b9cc735b4662 (patch) | |
| tree | ed321dbc3324b4f4b7a0b05cd9b47ecb2c56eec0 /servers/rendering | |
| parent | 9c80674aeeeab6cce7db6fbd6ea2805d9d0fee3b (diff) | |
| parent | 61d86190e0737607c7268e57288fbf60a6762e83 (diff) | |
Merge pull request #37914 from clayjohn/VULKAN-decal-fix
Fix texture check in decal setup
Diffstat (limited to 'servers/rendering')
| -rw-r--r-- | servers/rendering/rasterizer_rd/rasterizer_scene_high_end_rd.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/servers/rendering/rasterizer_rd/rasterizer_scene_high_end_rd.cpp b/servers/rendering/rasterizer_rd/rasterizer_scene_high_end_rd.cpp index b335300ad0..77096b95ba 100644 --- a/servers/rendering/rasterizer_rd/rasterizer_scene_high_end_rd.cpp +++ b/servers/rendering/rasterizer_rd/rasterizer_scene_high_end_rd.cpp @@ -2007,6 +2007,7 @@ void RasterizerSceneHighEndRD::_setup_decals(const RID *p_decal_instances, int p dd.normal_fade = storage->decal_get_normal_fade(decal); RID albedo_tex = storage->decal_get_texture(decal, RS::DECAL_TEXTURE_ALBEDO); + RID emission_tex = storage->decal_get_texture(decal, RS::DECAL_TEXTURE_EMISSION); if (albedo_tex.is_valid()) { Rect2 rect = storage->decal_atlas_get_texture_rect(albedo_tex); dd.albedo_rect[0] = rect.position.x; @@ -2015,6 +2016,9 @@ void RasterizerSceneHighEndRD::_setup_decals(const RID *p_decal_instances, int p dd.albedo_rect[3] = rect.size.y; } else { + if (!emission_tex.is_valid()) { + continue; //no albedo, no emission, no decal. + } dd.albedo_rect[0] = 0; dd.albedo_rect[1] = 0; dd.albedo_rect[2] = 0; @@ -2022,7 +2026,6 @@ void RasterizerSceneHighEndRD::_setup_decals(const RID *p_decal_instances, int p } RID normal_tex = storage->decal_get_texture(decal, RS::DECAL_TEXTURE_NORMAL); - RID emission_tex = storage->decal_get_texture(decal, RS::DECAL_TEXTURE_EMISSION); if (normal_tex.is_valid()) { Rect2 rect = storage->decal_atlas_get_texture_rect(normal_tex); @@ -2033,13 +2036,7 @@ void RasterizerSceneHighEndRD::_setup_decals(const RID *p_decal_instances, int p Basis normal_xform = p_camera_inverse_xform.basis * xform.basis.orthonormalized(); store_basis_3x4(normal_xform, dd.normal_xform); - - //store normal xform } else { - - if (!emission_tex.is_valid()) { - continue; //no albedo, no emission, no decal. - } dd.normal_rect[0] = 0; dd.normal_rect[1] = 0; dd.normal_rect[2] = 0; |