[Bf-blender-cvs] [1d536c21dd3] master: Cleanup: clang-format
Campbell Barton
noreply at git.blender.org
Thu Jan 20 02:00:07 CET 2022
Commit: 1d536c21dd390e08d36cc398433e6a6ac2d9bdd5
Author: Campbell Barton
Date: Thu Jan 20 11:48:29 2022 +1100
Branches: master
https://developer.blender.org/rB1d536c21dd390e08d36cc398433e6a6ac2d9bdd5
Cleanup: clang-format
===================================================================
M intern/cycles/device/metal/device_impl.mm
M source/blender/editors/sculpt_paint/sculpt_intern.h
M source/blender/gpu/intern/gpu_shader_info_baked.cc
M source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_2D_flat_color_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_2D_line_dashed_uniform_color_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_2D_uniform_color_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_3D_line_dashed_uniform_color_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh
M source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
===================================================================
diff --git a/intern/cycles/device/metal/device_impl.mm b/intern/cycles/device/metal/device_impl.mm
index 1105fb20360..5906da3680b 100644
--- a/intern/cycles/device/metal/device_impl.mm
+++ b/intern/cycles/device/metal/device_impl.mm
@@ -444,7 +444,7 @@ void MetalDevice::erase_allocation(device_memory &mem)
/* blank out reference to MetalMem* in the launch params (fixes crash T94736) */
if (mmem->pointer_index >= 0) {
- device_ptr *pointers = (device_ptr*)&launch_params;
+ device_ptr *pointers = (device_ptr *)&launch_params;
pointers[mmem->pointer_index] = 0;
}
metal_mem_map.erase(it);
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index 20e0046d69b..53ecc4a8314 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -369,7 +369,6 @@ typedef struct {
struct DistRayAABB_Precalc *dist_ray_to_aabb_precalc;
} SculptSearchCircleData;
-
/* Sculpt Filters */
typedef enum SculptFilterOrientation {
SCULPT_FILTER_ORIENTATION_LOCAL = 0,
@@ -460,7 +459,6 @@ typedef struct FilterCache {
AutomaskingCache *automasking;
} FilterCache;
-
/**
* This structure contains all the temporary data
* needed for individual brush strokes.
@@ -783,7 +781,6 @@ typedef struct ExpandCache {
/** \} */
-
/* -------------------------------------------------------------------- */
/** \name Sculpt Poll Functions
* \{ */
@@ -820,7 +817,6 @@ void SCULPT_flush_stroke_deform(struct Sculpt *sd, Object *ob, bool is_proxy_use
void SCULPT_tag_update_overlays(bContext *C);
/** \} */
-
/* -------------------------------------------------------------------- */
/** \name Stroke Functions
* \{ */
@@ -854,7 +850,6 @@ float SCULPT_raycast_init(struct ViewContext *vc,
/* Symmetry */
char SCULPT_mesh_symmetry_xyz_get(Object *object);
-
/**
* Returns true when the step belongs to the stroke that is directly performed by the brush and
* not by one of the symmetry passes.
@@ -913,7 +908,6 @@ float *SCULPT_brush_deform_target_vertex_co_get(SculptSession *ss,
int deform_target,
PBVHVertexIter *iter);
-
void SCULPT_vertex_neighbors_get(struct SculptSession *ss,
int index,
bool include_duplicates,
@@ -927,7 +921,7 @@ void SCULPT_vertex_neighbors_get(struct SculptSession *ss,
neighbor_iterator.index = neighbor_iterator.neighbors[neighbor_iterator.i];
/** Iterate over neighboring and duplicate vertices (for PBVH_GRIDS). Duplicates come
- * first since they are nearest for floodfill. */
+ * first since they are nearest for floodfill. */
#define SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN(ss, v_index, neighbor_iterator) \
SCULPT_vertex_neighbors_get(ss, v_index, true, &neighbor_iterator); \
for (neighbor_iterator.i = neighbor_iterator.size - 1; neighbor_iterator.i >= 0; \
@@ -1115,10 +1109,9 @@ void SCULPT_flip_quat_by_symm_area(float quat[4],
ePaintSymmetryAreas symmarea,
const float pivot[3]);
-
/**
-* Initialize a point-in-brush test
-*/
+ * Initialize a point-in-brush test
+ */
void SCULPT_brush_test_init(struct SculptSession *ss, SculptBrushTest *test);
bool SCULPT_brush_test_sphere(SculptBrushTest *test, const float co[3]);
@@ -1435,8 +1428,6 @@ bool SCULPT_pbvh_calc_area_normal(const struct Brush *brush,
bool use_threading,
float r_area_no[3]);
-
-
/**
* Flip all the edit-data across the axis/axes specified by \a symm.
* Used to calculate multiple modifications to the mesh when symmetry is enabled.
diff --git a/source/blender/gpu/intern/gpu_shader_info_baked.cc b/source/blender/gpu/intern/gpu_shader_info_baked.cc
index 00af803f765..55115a6d459 100644
--- a/source/blender/gpu/intern/gpu_shader_info_baked.cc
+++ b/source/blender/gpu/intern/gpu_shader_info_baked.cc
@@ -19,6 +19,6 @@
/** \file
* \ingroup gpu
- *
+ *
* Intentionally empty for compiling shader builder.
- */
\ No newline at end of file
+ */
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh
index a69420bede4..48c261da8dd 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh
@@ -21,7 +21,6 @@
* \ingroup gpu
*/
-
#include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_checker)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh
index fa715cdcb1d..51ce7f503df 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh
@@ -21,7 +21,6 @@
* \ingroup gpu
*/
-
#include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_diag_stripes)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_flat_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_flat_color_info.hh
index 93d46f8acd8..bbc5446f16f 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_flat_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_flat_color_info.hh
@@ -21,7 +21,6 @@
* \ingroup gpu
*/
-
#include "gpu_shader_create_info.hh"
#include "gpu_interface_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_line_dashed_uniform_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_line_dashed_uniform_color_info.hh
index 419cd4bc47c..371a35386a7 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_line_dashed_uniform_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_line_dashed_uniform_color_info.hh
@@ -21,7 +21,6 @@
* \ingroup gpu
*/
-
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh
index 60612a51135..0029e8d2044 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh
@@ -21,7 +21,6 @@
* \ingroup gpu
*/
-
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_uniform_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_uniform_color_info.hh
index 8977a34986e..7e75b265711 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_uniform_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_uniform_color_info.hh
@@ -21,7 +21,6 @@
* \ingroup gpu
*/
-
#include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_uniform_color)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh
index 7ea067010cd..3e7e4aeecda 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh
@@ -21,7 +21,6 @@
* \ingroup gpu
*/
-
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
index 5857e4cab03..70b2dac8266 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
@@ -21,7 +21,6 @@
* \ingroup gpu
*/
-
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh
index a838f6581dc..b829975448c 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh
@@ -21,7 +21,6 @@
* \ingroup gpu
*/
-
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_line_dashed_uniform_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_line_dashed_uniform_color_info.hh
index 93cbf1ab06f..d43ea799420 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_line_dashed_uniform_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_line_dashed_uniform_color_info.hh
@@ -21,7 +21,6 @@
* \ingroup gpu
*/
-
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh
index 1e195e7ff23..d2961c10a1f 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh
@@ -21,7 +21,6 @@
* \ingroup gpu
*/
-
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh
index 91797b9b414..c99d9ed199d 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh
@@ -21,7 +21,6 @@
* \ingroup gpu
*/
-
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh
index 6162d68cf2e..5b8517310ea 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh
@@ -21,7 +21,6
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list