bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Jeroen Bakker 2024-06-17 09:37:12 +02:00
commit f8d95401d9
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/startup/bl_ui/properties_view_layer.py
View File

@ -184,6 +184,7 @@ class VIEWLAYER_PT_eevee_next_layer_passes_light(ViewLayerButtonsPanel, Panel):
col.prop(view_layer, "use_pass_environment")
col.prop(view_layer, "use_pass_shadow")
col.prop(view_layer, "use_pass_ambient_occlusion", text="Ambient Occlusion")
col.prop(view_layer_eevee, "use_pass_transparent", text="Transparent")
col = layout.column()
col.active = view_layer.use_pass_ambient_occlusion

5
source/blender/draw/engines/eevee_next/eevee_film.hh
View File

@ -155,7 +155,10 @@ class Film {
static bool pass_is_float3(eViewLayerEEVEEPassType pass_type)
{
return pass_storage_type(pass_type) == PASS_STORAGE_COLOR &&
!ELEM(pass_type, EEVEE_RENDER_PASS_COMBINED, EEVEE_RENDER_PASS_VECTOR);
!ELEM(pass_type,
EEVEE_RENDER_PASS_COMBINED,
EEVEE_RENDER_PASS_VECTOR,
EEVEE_RENDER_PASS_TRANSPARENT);
}
/* Returns layer offset in the accumulation texture. -1 if the pass is not enabled. */

4
source/blender/draw/engines/eevee_next/eevee_instance.cc
View File

@ -89,6 +89,9 @@ void Instance::init(const int2 &output_res,
if (is_painting()) {
sampling.reset();
}
if (is_navigating() && scene->eevee.flag & SCE_EEVEE_SHADOW_JITTERED_VIEWPORT) {
sampling.reset();
}
update_eval_members();
@ -608,6 +611,7 @@ void Instance::update_passes(RenderEngine *engine, Scene *scene, ViewLayer *view
CHECK_PASS_LEGACY(ENVIRONMENT, SOCK_RGBA, 3, "RGB");
CHECK_PASS_LEGACY(SHADOW, SOCK_RGBA, 3, "RGB");
CHECK_PASS_LEGACY(AO, SOCK_RGBA, 3, "RGB");
CHECK_PASS_EEVEE(TRANSPARENT, SOCK_RGBA, 4, "RGBA");
LISTBASE_FOREACH (ViewLayerAOV *, aov, &view_layer->aovs) {
if ((aov->flag & AOV_CONFLICT) != 0) {