kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merge remote-tracking branch 'origin/blender-v3.6-release'

Browse Source
This commit is contained in:
Dalai Felinto 2023-06-02 11:10:45 +02:00
commit 390f8fef76
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,13 @@ void device_metal_info(vector<DeviceInfo> &devices)
info.has_nanovdb = vendor == METAL_GPU_APPLE;
info.has_light_tree = vendor != METAL_GPU_AMD;
info.use_hardware_raytracing = vendor != METAL_GPU_INTEL;
if (info.use_hardware_raytracing) {
if (@available(macos 11.0, *)) {
info.use_hardware_raytracing = device.supportsRaytracing;
}
}
devices.push_back(info);
device_index++;

10
source/blender/blenkernel/intern/image_partial_update.cc
View File

@ -420,7 +420,15 @@ struct PartialUpdateRegisterImpl {
*/
bool can_construct(ChangesetID changeset_id)
{
return changeset_id >= first_changeset_id;
if (changeset_id < first_changeset_id) {
return false;
}
if (changeset_id > last_changeset_id) {
return false;
}
return true;
}
/**