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

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Sergey Sharybin
2024-11-04 17:54:52 +01:00
parent b4f59c5348 d1368883ed
commit aec4ba39b9
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/device/metal/device.mm
View File

@@ -92,7 +92,8 @@ void device_metal_info(vector<DeviceInfo> &devices)
info.use_hardware_raytracing = device.supportsRaytracing;
/* Use hardware raytracing for faster rendering on architectures that support it. */
info.use_metalrt_by_default = (MetalInfo::get_apple_gpu_architecture(device) >= APPLE_M3);
info.use_metalrt_by_default = device.supportsRaytracing &&
(MetalInfo::get_apple_gpu_architecture(device) >= APPLE_M3);
}
# endif

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

@@ -435,8 +435,11 @@ void VolumeProbeModule::set_view(View & /*view*/)
grid_upload_ps_.bind_texture("visibility_c_tx", use_vis ? &visibility_c_tx : &irradiance_c_tx);
grid_upload_ps_.bind_texture("visibility_d_tx", use_vis ? &visibility_d_tx : &irradiance_d_tx);
/* Runtime grid is padded for blending with surrounding probes. */
int3 grid_size_with_padding = grid_size + 2;
/* Note that we take into account the padding border of each brick. */
int3 grid_size_in_bricks = math::divide_ceil(grid_size, int3(IRRADIANCE_GRID_BRICK_SIZE - 1));
int3 grid_size_in_bricks = math::divide_ceil(grid_size_with_padding,
int3(IRRADIANCE_GRID_BRICK_SIZE - 1));
grid_upload_ps_.dispatch(grid_size_in_bricks);
/* Sync with next load. */
grid_upload_ps_.barrier(GPU_BARRIER_TEXTURE_FETCH);

1
source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc
View File

@@ -379,6 +379,7 @@ static int grease_pencil_layer_group_add_exec(bContext *C, wmOperator *op)
}
MEM_SAFE_FREE(new_layer_group_name);
grease_pencil.set_active_node(&new_group.as_node());
DEG_id_tag_update(&grease_pencil.id, ID_RECALC_GEOMETRY);
WM_event_add_notifier(C, NC_GEOM | ND_DATA, &grease_pencil);