griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/blender-v4.3-release'

Browse Source
This commit is contained in:
Ray Molenkamp
2024-10-10 12:09:25 -06:00
parent c55edd1310 1d11123da7
commit de5ac7395e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/windows_x64

Submodule lib/windows_x64 updated: efa049df4c...9cbf98edb0

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

@@ -311,11 +311,6 @@ void Instance::object_sync_render(void *instance_,
{
UNUSED_VARS(engine, depsgraph);
Instance &inst = *reinterpret_cast<Instance *>(instance_);
if (inst.is_baking() && ob->visibility_flag & OB_HIDE_PROBE_VOLUME) {
return;
}
inst.object_sync(ob);
}

7
source/blender/draw/engines/eevee_next/eevee_material.cc
View File

@@ -303,11 +303,16 @@ Material &MaterialModule::material_sync(Object *ob,
Material &mat = material_map_.lookup_or_add_cb(material_key, [&]() {
Material mat;
if (inst_.is_baking()) {
if (ob->visibility_flag & OB_HIDE_PROBE_VOLUME) {
mat.capture = MaterialPass();
}
else {
mat.capture = material_pass_get(ob, blender_mat, MAT_PIPE_CAPTURE, geometry_type);
}
mat.prepass = MaterialPass();
/* TODO(fclem): Still need the shading pass for correct attribute extraction. Would be better
* to avoid this shader compilation in another context. */
mat.shading = material_pass_get(ob, blender_mat, surface_pipe, geometry_type);
mat.capture = material_pass_get(ob, blender_mat, MAT_PIPE_CAPTURE, geometry_type);
mat.overlap_masking = MaterialPass();
mat.lightprobe_sphere_prepass = MaterialPass();
mat.lightprobe_sphere_shading = MaterialPass();