Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/bmesh/intern/bmesh_operators.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_operators.h')
-rw-r--r--source/blender/bmesh/intern/bmesh_operators.h171
1 files changed, 91 insertions, 80 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operators.h b/source/blender/bmesh/intern/bmesh_operators.h
index 6c0a6854d8e..0279e4dd23e 100644
--- a/source/blender/bmesh/intern/bmesh_operators.h
+++ b/source/blender/bmesh/intern/bmesh_operators.h
@@ -27,132 +27,143 @@
/*quad innervert values*/
enum {
- SUBD_CORNER_INNERVERT,
- SUBD_CORNER_PATH,
- SUBD_CORNER_FAN,
- SUBD_CORNER_STRAIGHT_CUT,
+ SUBD_CORNER_INNERVERT,
+ SUBD_CORNER_PATH,
+ SUBD_CORNER_FAN,
+ SUBD_CORNER_STRAIGHT_CUT,
};
/* aligned with PROP_SMOOTH and friends */
enum {
- SUBD_FALLOFF_SMOOTH = 0,
- SUBD_FALLOFF_SPHERE,
- SUBD_FALLOFF_ROOT,
- SUBD_FALLOFF_SHARP,
- SUBD_FALLOFF_LIN,
- SUBD_FALLOFF_INVSQUARE = 7, /* matching PROP_INVSQUARE */
+ SUBD_FALLOFF_SMOOTH = 0,
+ SUBD_FALLOFF_SPHERE,
+ SUBD_FALLOFF_ROOT,
+ SUBD_FALLOFF_SHARP,
+ SUBD_FALLOFF_LIN,
+ SUBD_FALLOFF_INVSQUARE = 7, /* matching PROP_INVSQUARE */
};
enum {
- SUBDIV_SELECT_NONE,
- SUBDIV_SELECT_ORIG,
- SUBDIV_SELECT_INNER,
- SUBDIV_SELECT_LOOPCUT,
+ SUBDIV_SELECT_NONE,
+ SUBDIV_SELECT_ORIG,
+ SUBDIV_SELECT_INNER,
+ SUBDIV_SELECT_LOOPCUT,
};
/* subdivide_edgering */
enum {
- /* just subdiv */
- SUBD_RING_INTERP_LINEAR,
+ /* just subdiv */
+ SUBD_RING_INTERP_LINEAR,
- /* single bezier spline - curve follows bezier rotation */
- SUBD_RING_INTERP_PATH,
+ /* single bezier spline - curve follows bezier rotation */
+ SUBD_RING_INTERP_PATH,
- /* beziers based on adjacent faces (fallback to tangent) */
- SUBD_RING_INTERP_SURF,
+ /* beziers based on adjacent faces (fallback to tangent) */
+ SUBD_RING_INTERP_SURF,
};
/* similar face selection slot values */
enum {
- SIMFACE_MATERIAL = 201,
- SIMFACE_AREA,
- SIMFACE_SIDES,
- SIMFACE_PERIMETER,
- SIMFACE_NORMAL,
- SIMFACE_COPLANAR,
- SIMFACE_SMOOTH,
- SIMFACE_FACEMAP,
- SIMFACE_FREESTYLE,
+ SIMFACE_MATERIAL = 201,
+ SIMFACE_AREA,
+ SIMFACE_SIDES,
+ SIMFACE_PERIMETER,
+ SIMFACE_NORMAL,
+ SIMFACE_COPLANAR,
+ SIMFACE_SMOOTH,
+ SIMFACE_FACEMAP,
+ SIMFACE_FREESTYLE,
};
/* similar edge selection slot values */
enum {
- SIMEDGE_LENGTH = 101,
- SIMEDGE_DIR,
- SIMEDGE_FACE,
- SIMEDGE_FACE_ANGLE,
- SIMEDGE_CREASE,
- SIMEDGE_BEVEL,
- SIMEDGE_SEAM,
- SIMEDGE_SHARP,
- SIMEDGE_FREESTYLE,
+ SIMEDGE_LENGTH = 101,
+ SIMEDGE_DIR,
+ SIMEDGE_FACE,
+ SIMEDGE_FACE_ANGLE,
+ SIMEDGE_CREASE,
+ SIMEDGE_BEVEL,
+ SIMEDGE_SEAM,
+ SIMEDGE_SHARP,
+ SIMEDGE_FREESTYLE,
};
/* similar vertex selection slot values */
enum {
- SIMVERT_NORMAL = 0,
- SIMVERT_FACE,
- SIMVERT_VGROUP,
- SIMVERT_EDGE,
+ SIMVERT_NORMAL = 0,
+ SIMVERT_FACE,
+ SIMVERT_VGROUP,
+ SIMVERT_EDGE,
};
/* Poke face center calculation */
enum {
- BMOP_POKE_MEDIAN_WEIGHTED = 0,
- BMOP_POKE_MEDIAN,
- BMOP_POKE_BOUNDS,
+ BMOP_POKE_MEDIAN_WEIGHTED = 0,
+ BMOP_POKE_MEDIAN,
+ BMOP_POKE_BOUNDS,
};
/* Bevel offset_type slot values */
enum {
- BEVEL_AMT_OFFSET,
- BEVEL_AMT_WIDTH,
- BEVEL_AMT_DEPTH,
- BEVEL_AMT_PERCENT,
+ BEVEL_AMT_OFFSET,
+ BEVEL_AMT_WIDTH,
+ BEVEL_AMT_DEPTH,
+ BEVEL_AMT_PERCENT,
};
/* Bevel face_strength_mode values: should match face_str mode enum in DNA_modifer_types.h */
enum {
- BEVEL_FACE_STRENGTH_NONE,
- BEVEL_FACE_STRENGTH_NEW,
- BEVEL_FACE_STRENGTH_AFFECTED,
- BEVEL_FACE_STRENGTH_ALL,
+ BEVEL_FACE_STRENGTH_NONE,
+ BEVEL_FACE_STRENGTH_NEW,
+ BEVEL_FACE_STRENGTH_AFFECTED,
+ BEVEL_FACE_STRENGTH_ALL,
};
/* Bevel miter slot values */
enum {
- BEVEL_MITER_SHARP,
- BEVEL_MITER_PATCH,
- BEVEL_MITER_ARC,
+ BEVEL_MITER_SHARP,
+ BEVEL_MITER_PATCH,
+ BEVEL_MITER_ARC,
};
extern const BMOpDefine *bmo_opdefines[];
-extern const int bmo_opdefines_total;
+extern const int bmo_opdefines_total;
/*------specific operator helper functions-------*/
-void BM_mesh_esubdivide(
- BMesh *bm, const char edge_hflag,
- const float smooth, const short smooth_falloff, const bool use_smooth_even,
- const float fractal, const float along_normal,
- const int numcuts,
- const int seltype, const int cornertype,
- const short use_single_edge, const short use_grid_fill,
- const short use_only_quads,
- const int seed);
-
-void BM_mesh_calc_uvs_grid(
- BMesh *bm, const uint x_segments, const uint y_segments,
- const short oflag, const int cd_loop_uv_offset);
-void BM_mesh_calc_uvs_sphere(
- BMesh *bm,
- const short oflag, const int cd_loop_uv_offset);
-void BM_mesh_calc_uvs_circle(
- BMesh *bm, float mat[4][4], const float radius,
- const short oflag, const int cd_loop_uv_offset);
-void BM_mesh_calc_uvs_cone(
- BMesh *bm, float mat[4][4],
- const float radius_top, const float radius_bottom, const int segments, const bool cap_ends,
- const short oflag, const int cd_loop_uv_offset);
+void BM_mesh_esubdivide(BMesh *bm,
+ const char edge_hflag,
+ const float smooth,
+ const short smooth_falloff,
+ const bool use_smooth_even,
+ const float fractal,
+ const float along_normal,
+ const int numcuts,
+ const int seltype,
+ const int cornertype,
+ const short use_single_edge,
+ const short use_grid_fill,
+ const short use_only_quads,
+ const int seed);
+
+void BM_mesh_calc_uvs_grid(BMesh *bm,
+ const uint x_segments,
+ const uint y_segments,
+ const short oflag,
+ const int cd_loop_uv_offset);
+void BM_mesh_calc_uvs_sphere(BMesh *bm, const short oflag, const int cd_loop_uv_offset);
+void BM_mesh_calc_uvs_circle(BMesh *bm,
+ float mat[4][4],
+ const float radius,
+ const short oflag,
+ const int cd_loop_uv_offset);
+void BM_mesh_calc_uvs_cone(BMesh *bm,
+ float mat[4][4],
+ const float radius_top,
+ const float radius_bottom,
+ const int segments,
+ const bool cap_ends,
+ const short oflag,
+ const int cd_loop_uv_offset);
void BM_mesh_calc_uvs_cube(BMesh *bm, const short oflag);
#include "intern/bmesh_operator_api_inline.h"