[Bf-blender-cvs] [105c8d59cd0] master: Cleanup: format
Campbell Barton
noreply at git.blender.org
Fri Oct 28 08:08:40 CEST 2022
Commit: 105c8d59cd07ee401722cd0a29a2fb059f2d7743
Author: Campbell Barton
Date: Fri Oct 28 17:06:21 2022 +1100
Branches: master
https://developer.blender.org/rB105c8d59cd07ee401722cd0a29a2fb059f2d7743
Cleanup: format
===================================================================
M intern/cycles/blender/addon/ui.py
M source/blender/draw/intern/draw_pbvh.cc
===================================================================
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 581533db0b6..305accc8f1a 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -149,6 +149,7 @@ def get_effective_preview_denoiser(context):
return 'OIDN'
+
def use_mnee(context):
# The MNEE kernel doesn't compile on macOS < 13.
if use_metal(context):
@@ -158,6 +159,7 @@ def use_mnee(context):
return False
return True
+
class CYCLES_RENDER_PT_sampling(CyclesButtonsPanel, Panel):
bl_label = "Sampling"
diff --git a/source/blender/draw/intern/draw_pbvh.cc b/source/blender/draw/intern/draw_pbvh.cc
index a4de9e4fa47..b25bb42a8a5 100644
--- a/source/blender/draw/intern/draw_pbvh.cc
+++ b/source/blender/draw/intern/draw_pbvh.cc
@@ -951,7 +951,8 @@ struct PBVHBatches {
void create_index_faces(PBVH_GPU_Args *args)
{
- int *mat_index = static_cast<int*>(CustomData_get_layer_named(args->pdata, CD_PROP_INT32, "material_index"));
+ int *mat_index = static_cast<int *>(
+ CustomData_get_layer_named(args->pdata, CD_PROP_INT32, "material_index"));
if (mat_index && args->totprim) {
int poly_index = args->mlooptri[args->prim_indices[0]].poly;
More information about the Bf-blender-cvs
mailing list