blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Campbell Barton 2022-01-20 11:48:29 +11:00
parent e3f9d9b206
commit 1d536c21dd
17 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/metal/device_impl.mm
View File

@ -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);

15
source/blender/editors/sculpt_paint/sculpt_intern.h
View File

@ -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.

4
source/blender/gpu/intern/gpu_shader_info_baked.cc
View File

@ -19,6 +19,6 @@
/** \file
* \ingroup gpu
*
*
* Intentionally empty for compiling shader builder.
*/
*/

1
source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_checker)

1
source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_diag_stripes)

1
source/blender/gpu/shaders/infos/gpu_shader_2D_flat_color_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_shader_create_info.hh"
#include "gpu_interface_info.hh"

1
source/blender/gpu/shaders/infos/gpu_shader_2D_line_dashed_uniform_color_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"

1
source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"

1
source/blender/gpu/shaders/infos/gpu_shader_2D_uniform_color_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_uniform_color)

1
source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"

1
source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"

1
source/blender/gpu/shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"

1
source/blender/gpu/shaders/infos/gpu_shader_3D_line_dashed_uniform_color_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"

1
source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"

1
source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_interface_info.hh"
#include "gpu_shader_create_info.hh"

1
source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh
View File

@ -21,7 +21,6 @@
* \ingroup gpu
*/
#include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_3D_uniform_color)

4
source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
View File

@ -345,8 +345,8 @@ void OBJMesh::store_normal_coords_and_indices(Vector<float3> &r_normal_coords)
normal_to_index.reserve(export_mesh_eval_->totpoly);
loop_to_normal_index_.resize(export_mesh_eval_->totloop);
loop_to_normal_index_.fill(-1);
const float(*lnors)[3] = (const float(*)[3])(
CustomData_get_layer(&export_mesh_eval_->ldata, CD_NORMAL));
const float(
*lnors)[3] = (const float(*)[3])(CustomData_get_layer(&export_mesh_eval_->ldata, CD_NORMAL));
for (int poly_index = 0; poly_index < export_mesh_eval_->totpoly; ++poly_index) {
const MPoly &mpoly = export_mesh_eval_->mpoly[poly_index];
bool need_per_loop_normals = is_ith_poly_smooth(poly_index);