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

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Weizhen Huang
2024-06-21 15:09:47 +02:00
parent 1c322889fd 23e497d1af
commit f26e84098a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/integrator/denoiser.cpp
View File

@@ -125,9 +125,7 @@ unique_ptr<Denoiser> Denoiser::create(Device *denoiser_device,
DenoiserType Denoiser::automatic_viewport_denoiser_type(const DeviceInfo &path_trace_device_info)
{
#ifdef WITH_OPENIMAGEDENOISE
if (path_trace_device_info.type != DEVICE_CPU &&
OIDNDenoiserGPU::is_device_supported(path_trace_device_info))
{
if (OIDNDenoiserGPU::is_device_supported(path_trace_device_info)) {
return DENOISER_OPENIMAGEDENOISE;
}
#else

4
source/blender/blenkernel/intern/volume.cc
View File

@@ -191,6 +191,10 @@ static void volume_free_data(ID *id)
BKE_animdata_free(&volume->id, false);
BKE_volume_batch_cache_free(volume);
MEM_SAFE_FREE(volume->mat);
if (volume->packedfile) {
BKE_packedfile_free(volume->packedfile);
volume->packedfile = nullptr;
}
#ifdef WITH_OPENVDB
MEM_delete(volume->runtime->grids);
volume->runtime->grids = nullptr;