blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v3.2-release'

This commit is contained in:
Jeroen Bakker 2022-05-10 08:30:56 +02:00
parent bc256a4507 11aa237858
commit 08a39d32a9
Notes: blender-bot 2023-02-14 10:21:11 +01:00 
Referenced by issue #98305, Regression: Calling save on image fails due to file path options not being correctly applied
Referenced by issue #98128, Regression: EEVEE: Default Cube is black on Intel
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/gpu/shaders/material/gpu_shader_material_eevee_specular.glsl
View File

@ -64,6 +64,8 @@ void node_eevee_specular(vec4 diffuse,
else {
result = closure_eval(diffuse_data, reflection_data);
}
result = closure_add(result, closure_eval(emission_data));
result = closure_add(result, closure_eval(transparency_data));
Closure emission_cl = closure_eval(emission_data);
Closure transparency_cl = closure_eval(transparency_data);
result = closure_add(result, emission_cl);
result = closure_add(result, transparency_cl);
}

6
source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl
View File

@ -169,6 +169,8 @@ void node_bsdf_principled(vec4 base_color,
/* Un-optimized case. */
result = closure_eval(diffuse_data, reflection_data, clearcoat_data, refraction_data);
}
result = closure_add(result, closure_eval(emission_data));
result = closure_add(result, closure_eval(transparency_data));
Closure emission_cl = closure_eval(emission_data);
Closure transparency_cl = closure_eval(transparency_data);
result = closure_add(result, emission_cl);
result = closure_add(result, transparency_cl);
}