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

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Weizhen Huang
2025-10-15 11:24:11 +02:00
parent 8712909ae1 6c241737e8
commit 82892b6f08
2 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
intern/cycles/kernel/integrator/shade_volume.h
View File

@@ -304,28 +304,29 @@ ccl_device_noinline Extrema<float> volume_estimate_extrema(KernelGlobals kg,
const IntegratorGenericState state,
const ccl_private RNGState *rng_state,
const uint32_t path_flag,
const ccl_private OctreeTracing &octree)
const Interval<float> t,
const VolumeStack entry)
{
const bool homogeneous = volume_is_homogeneous(kg, octree.entry);
const bool homogeneous = volume_is_homogeneous(kg, entry);
const int samples = homogeneous ? 1 : 4;
const float shade_offset = homogeneous ?
0.5f :
path_state_rng_2D(kg, rng_state, PRNG_VOLUME_SHADE_OFFSET).y;
const float step_size = octree.t.length() / float(samples);
const float step_size = t.length() / float(samples);
/* Do not allocate closures. */
sd->num_closure_left = 0;
Extrema<float> extrema = {FLT_MAX, -FLT_MAX};
for (int i = 0; i < samples; i++) {
const float shade_t = octree.t.min + (shade_offset + i) * step_size;
const float shade_t = t.min + (shade_offset + i) * step_size;
sd->P = ray->P + ray->D * shade_t;
sd->closure_transparent_extinction = zero_float3();
sd->closure_emission_background = zero_float3();
volume_shader_eval_entry<shadow, KERNEL_FEATURE_NODE_MASK_VOLUME>(
kg, state, sd, octree.entry, path_flag);
kg, state, sd, entry, path_flag);
const float sigma = reduce_max(sd->closure_transparent_extinction);
const float emission = reduce_max(sd->closure_emission_background);
@@ -359,7 +360,8 @@ ccl_device_inline Extrema<float> volume_object_get_extrema(KernelGlobals kg,
return octree.node->sigma * object_volume_density(kg, octree.entry.object);
}
return volume_estimate_extrema<shadow>(kg, ray, sd, state, rng_state, path_flag, octree);
return volume_estimate_extrema<shadow>(
kg, ray, sd, state, rng_state, path_flag, octree.t, octree.entry);
}
/* Find the octree root node in the kernel array that corresponds to the volume stack entry. */

25
source/blender/blenloader/intern/readfile.cc
View File

@@ -3094,6 +3094,31 @@ static void read_libblock_undo_restore_at_old_address(FileData *fd, Main *main,
BLI_addtail(new_lb, id_old);
BLI_addtail(old_lb, id);
/* In case a library has been re-read, it has added already its own split main to the new Main
* (see #direct_link_library code).
*
* Since we are replacing it with the 'id_old' address, we need to update that Main::curlib
* pointer accordingly.
*
* Note that:
* - This code is only for undo, and on undo we do not re-read regular libraries, only archive
* ones for packed data.
* - The new split main should still be empty at this stage (this code and adding the split
* Main in #direct_link_library are part of the same #read_libblock call).
*/
if (GS(id_old->name) == ID_LI) {
Library *lib_old = blender::id_cast<Library *>(id_old);
Library *lib = blender::id_cast<Library *>(id);
BLI_assert(lib_old->flag & LIBRARY_FLAG_IS_ARCHIVE);
for (Main *bmain_iter : *fd->bmain->split_mains) {
if (bmain_iter->curlib == lib) {
BLI_assert(BKE_main_is_empty(bmain_iter));
bmain_iter->curlib = lib_old;
}
}
}
}
static bool read_libblock_undo_restore(