diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-06-29 13:13:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-06-29 13:13:24 +0300 |
| commit | 855f7fee63c4bc57d5e154ced0e7e51bf315ea32 (patch) | |
| tree | 8dadbf17ae51e2237972d8bea654350a4421b529 | |
| parent | 203d4052998479439a9d92d5e163b634a45d08bc (diff) | |
Cleanup: clang-format
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle.h | 5 | ||||
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 4 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader.cc | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/kernel/geom/geom_triangle.h b/intern/cycles/kernel/geom/geom_triangle.h index 0a9460aa166..208338a934b 100644 --- a/intern/cycles/kernel/geom/geom_triangle.h +++ b/intern/cycles/kernel/geom/geom_triangle.h @@ -77,7 +77,10 @@ ccl_device_inline void triangle_vertices(KernelGlobals *kg, int prim, float3 P[3 /* Triangle vertex locations and vertex normals */ -ccl_device_inline void triangle_vertices_and_normals(KernelGlobals *kg, int prim, float3 P[3], float3 N[3]) +ccl_device_inline void triangle_vertices_and_normals(KernelGlobals *kg, + int prim, + float3 P[3], + float3 N[3]) { const uint4 tri_vindex = kernel_tex_fetch(__tri_vindex, prim); P[0] = float4_to_float3(kernel_tex_fetch(__prim_tri_verts, tri_vindex.w + 0)); diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index c5c60c94d4a..620c58196dd 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -1923,8 +1923,8 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - const eMultiresSubdivideModeType subdivide_mode = (eMultiresSubdivideModeType)(RNA_enum_get( - op->ptr, "mode")); + const eMultiresSubdivideModeType subdivide_mode = (eMultiresSubdivideModeType)( + RNA_enum_get(op->ptr, "mode")); multiresModifier_subdivide(object, mmd, subdivide_mode); ED_object_iter_other( diff --git a/source/blender/gpu/intern/gpu_shader.cc b/source/blender/gpu/intern/gpu_shader.cc index 81430d41327..c754a649924 100644 --- a/source/blender/gpu/intern/gpu_shader.cc +++ b/source/blender/gpu/intern/gpu_shader.cc @@ -35,7 +35,6 @@ extern "C" char datatoc_gpu_shader_colorspace_lib_glsl[]; - using namespace blender; using namespace blender::gpu; |