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/blenkernel/BKE_subsurf.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/blenkernel/BKE_subsurf.h')
-rw-r--r--source/blender/blenkernel/BKE_subsurf.h137
1 files changed, 74 insertions, 63 deletions
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h
index 8b4fb712d61..cd48e4d7f3b 100644
--- a/source/blender/blenkernel/BKE_subsurf.h
+++ b/source/blender/blenkernel/BKE_subsurf.h
@@ -47,21 +47,20 @@ struct SubsurfModifierData;
/**************************** External *****************************/
typedef enum {
- SUBSURF_USE_RENDER_PARAMS = 1,
- SUBSURF_IS_FINAL_CALC = 2,
- SUBSURF_FOR_EDIT_MODE = 4,
- SUBSURF_IN_EDIT_MODE = 8,
- SUBSURF_ALLOC_PAINT_MASK = 16,
- SUBSURF_USE_GPU_BACKEND = 32,
- SUBSURF_IGNORE_SIMPLIFY = 64,
+ SUBSURF_USE_RENDER_PARAMS = 1,
+ SUBSURF_IS_FINAL_CALC = 2,
+ SUBSURF_FOR_EDIT_MODE = 4,
+ SUBSURF_IN_EDIT_MODE = 8,
+ SUBSURF_ALLOC_PAINT_MASK = 16,
+ SUBSURF_USE_GPU_BACKEND = 32,
+ SUBSURF_IGNORE_SIMPLIFY = 64,
} SubsurfFlags;
-struct DerivedMesh *subsurf_make_derived_from_derived(
- struct DerivedMesh *dm,
- struct SubsurfModifierData *smd,
- struct Scene *scene,
- float (*vertCos)[3],
- SubsurfFlags flags);
+struct DerivedMesh *subsurf_make_derived_from_derived(struct DerivedMesh *dm,
+ struct SubsurfModifierData *smd,
+ struct Scene *scene,
+ float (*vertCos)[3],
+ SubsurfFlags flags);
void subsurf_calculate_limit_positions(struct Mesh *me, float (*r_positions)[3]);
@@ -78,67 +77,79 @@ void subsurf_copy_grid_hidden(struct DerivedMesh *dm,
const struct MDisps *mdisps);
void subsurf_copy_grid_paint_mask(struct DerivedMesh *dm,
- const struct MPoly *mpoly, float *paint_mask,
+ const struct MPoly *mpoly,
+ float *paint_mask,
const struct GridPaintMask *grid_paint_mask);
bool subsurf_has_edges(struct DerivedMesh *dm);
bool subsurf_has_faces(struct DerivedMesh *dm);
typedef enum MultiresModifiedFlags {
- /* indicates the grids have been sculpted on, so MDisps
- * have to be updated */
- MULTIRES_COORDS_MODIFIED = 1,
- /* indicates elements have been hidden or unhidden */
- MULTIRES_HIDDEN_MODIFIED = 2,
+ /* indicates the grids have been sculpted on, so MDisps
+ * have to be updated */
+ MULTIRES_COORDS_MODIFIED = 1,
+ /* indicates elements have been hidden or unhidden */
+ MULTIRES_HIDDEN_MODIFIED = 2,
} MultiresModifiedFlags;
/**************************** Internal *****************************/
typedef struct CCGDerivedMesh {
- DerivedMesh dm;
-
- struct CCGSubSurf *ss;
- int freeSS;
- int drawInteriorEdges, useSubsurfUv, useGpuBackend;
-
- struct {int startVert; struct CCGVert *vert; } *vertMap;
- struct {int startVert; int startEdge; struct CCGEdge *edge; } *edgeMap;
- struct {int startVert; int startEdge;
- int startFace; struct CCGFace *face; } *faceMap;
-
- short *edgeFlags;
- struct DMFlagMat *faceFlags;
-
- int *reverseFaceMap;
-
- struct PBVH *pbvh;
-
- struct MeshElemMap *pmap;
- int *pmap_mem;
-
- struct CCGElem **gridData;
- int *gridOffset;
- struct CCGFace **gridFaces;
- struct DMFlagMat *gridFlagMats;
- unsigned int **gridHidden;
- /* Elements in arrays above. */
- unsigned int numGrid;
-
- struct {
- struct MultiresModifierData *mmd;
- int local_mmd;
-
- int lvl, totlvl;
- float (*orco)[3];
-
- struct Object *ob;
- MultiresModifiedFlags modified_flags;
- } multires;
-
- struct EdgeHash *ehash;
-
- ThreadMutex loops_cache_lock;
- ThreadRWMutex origindex_cache_rwlock;
+ DerivedMesh dm;
+
+ struct CCGSubSurf *ss;
+ int freeSS;
+ int drawInteriorEdges, useSubsurfUv, useGpuBackend;
+
+ struct {
+ int startVert;
+ struct CCGVert *vert;
+ } * vertMap;
+ struct {
+ int startVert;
+ int startEdge;
+ struct CCGEdge *edge;
+ } * edgeMap;
+ struct {
+ int startVert;
+ int startEdge;
+ int startFace;
+ struct CCGFace *face;
+ } * faceMap;
+
+ short *edgeFlags;
+ struct DMFlagMat *faceFlags;
+
+ int *reverseFaceMap;
+
+ struct PBVH *pbvh;
+
+ struct MeshElemMap *pmap;
+ int *pmap_mem;
+
+ struct CCGElem **gridData;
+ int *gridOffset;
+ struct CCGFace **gridFaces;
+ struct DMFlagMat *gridFlagMats;
+ unsigned int **gridHidden;
+ /* Elements in arrays above. */
+ unsigned int numGrid;
+
+ struct {
+ struct MultiresModifierData *mmd;
+ int local_mmd;
+
+ int lvl, totlvl;
+ float (*orco)[3];
+
+ struct Object *ob;
+ MultiresModifiedFlags modified_flags;
+ } multires;
+
+ struct EdgeHash *ehash;
+
+ ThreadMutex loops_cache_lock;
+ ThreadRWMutex origindex_cache_rwlock;
} CCGDerivedMesh;
#ifdef WITH_OPENSUBDIV