diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/BKE_multires.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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_multires.h')
-rw-r--r-- | source/blender/blenkernel/BKE_multires.h | 123 |
1 files changed, 73 insertions, 50 deletions
diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index c9c520835bc..33672b5d397 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -47,8 +47,7 @@ struct MVert; /* Delete mesh mdisps and grid paint masks */ void multires_customdata_delete(struct Mesh *me); -void multires_set_tot_level(struct Object *ob, - struct MultiresModifierData *mmd, int lvl); +void multires_set_tot_level(struct Object *ob, struct MultiresModifierData *mmd, int lvl); void multires_mark_as_modified(struct Object *ob, enum MultiresModifiedFlags flags); @@ -63,10 +62,10 @@ void multires_modifier_update_hidden(struct DerivedMesh *dm); void multiresModifier_set_levels_from_disps(struct MultiresModifierData *mmd, struct Object *ob); typedef enum { - MULTIRES_USE_LOCAL_MMD = 1, - MULTIRES_USE_RENDER_PARAMS = 2, - MULTIRES_ALLOC_PAINT_MASK = 4, - MULTIRES_IGNORE_SIMPLIFY = 8, + MULTIRES_USE_LOCAL_MMD = 1, + MULTIRES_USE_RENDER_PARAMS = 2, + MULTIRES_ALLOC_PAINT_MASK = 4, + MULTIRES_IGNORE_SIMPLIFY = 8, } MultiresFlags; struct DerivedMesh *multires_make_derived_from_derived(struct DerivedMesh *dm, @@ -77,17 +76,34 @@ struct DerivedMesh *multires_make_derived_from_derived(struct DerivedMesh *dm, struct MultiresModifierData *find_multires_modifier_before(struct Scene *scene, struct ModifierData *lastmd); -struct MultiresModifierData *get_multires_modifier(struct Scene *scene, struct Object *ob, bool use_first); -int multires_get_level(const struct Scene *scene, const struct Object *ob, const struct MultiresModifierData *mmd, - bool render, bool ignore_simplify); -struct Mesh *BKE_multires_create_mesh( - struct Depsgraph *depsgraph, struct Scene *scene, - struct MultiresModifierData *mmd, struct Object *ob); -void multiresModifier_del_levels(struct MultiresModifierData *mmd, struct Scene *scene, struct Object *object, int direction); -void multiresModifier_base_apply(struct MultiresModifierData *mmd, struct Scene *scene, struct Object *ob); -void multiresModifier_subdivide(struct MultiresModifierData *mmd, struct Scene *scene, struct Object *ob, int updateblock, int simple); -void multiresModifier_sync_levels_ex( - struct Scene *scene, struct Object *ob_dst, struct MultiresModifierData *mmd_src, struct MultiresModifierData *mmd_dst); +struct MultiresModifierData *get_multires_modifier(struct Scene *scene, + struct Object *ob, + bool use_first); +int multires_get_level(const struct Scene *scene, + const struct Object *ob, + const struct MultiresModifierData *mmd, + bool render, + bool ignore_simplify); +struct Mesh *BKE_multires_create_mesh(struct Depsgraph *depsgraph, + struct Scene *scene, + struct MultiresModifierData *mmd, + struct Object *ob); +void multiresModifier_del_levels(struct MultiresModifierData *mmd, + struct Scene *scene, + struct Object *object, + int direction); +void multiresModifier_base_apply(struct MultiresModifierData *mmd, + struct Scene *scene, + struct Object *ob); +void multiresModifier_subdivide(struct MultiresModifierData *mmd, + struct Scene *scene, + struct Object *ob, + int updateblock, + int simple); +void multiresModifier_sync_levels_ex(struct Scene *scene, + struct Object *ob_dst, + struct MultiresModifierData *mmd_src, + struct MultiresModifierData *mmd_dst); void multires_stitch_grids(struct Object *); @@ -96,8 +112,13 @@ void multires_free(struct Multires *mr); void multires_load_old(struct Object *ob, struct Mesh *me); void multires_load_old_250(struct Mesh *); -void multiresModifier_scale_disp(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob); -void multiresModifier_prepare_join(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, struct Object *to_ob); +void multiresModifier_scale_disp(struct Depsgraph *depsgraph, + struct Scene *scene, + struct Object *ob); +void multiresModifier_prepare_join(struct Depsgraph *depsgraph, + struct Scene *scene, + struct Object *ob, + struct Object *to_ob); int multires_mdisp_corners(struct MDisps *s); @@ -106,42 +127,45 @@ void multires_topology_changed(struct Mesh *me); /**** interpolation stuff ****/ void old_mdisps_bilinear(float out[3], float (*disps)[3], const int st, float u, float v); -int mdisp_rot_face_to_crn(struct MVert *mvert, struct MPoly *mpoly, struct MLoop *mloops, const struct MLoopTri *lt, const int face_side, const float u, const float v, float *x, float *y); +int mdisp_rot_face_to_crn(struct MVert *mvert, + struct MPoly *mpoly, + struct MLoop *mloops, + const struct MLoopTri *lt, + const int face_side, + const float u, + const float v, + float *x, + float *y); /* Reshaping, define in multires_reshape.c */ -bool multiresModifier_reshapeFromObject( - struct Depsgraph *depsgraph, - struct MultiresModifierData *mmd, - struct Object *dst, - struct Object *src); -bool multiresModifier_reshapeFromDeformModifier( - struct Depsgraph *depsgraph, - struct MultiresModifierData *mmd, - struct Object *ob, - struct ModifierData *md); -bool multiresModifier_reshapeFromCCG( - const int tot_level, - struct Mesh *coarse_mesh, - struct SubdivCCG *subdiv_ccg); +bool multiresModifier_reshapeFromObject(struct Depsgraph *depsgraph, + struct MultiresModifierData *mmd, + struct Object *dst, + struct Object *src); +bool multiresModifier_reshapeFromDeformModifier(struct Depsgraph *depsgraph, + struct MultiresModifierData *mmd, + struct Object *ob, + struct ModifierData *md); +bool multiresModifier_reshapeFromCCG(const int tot_level, + struct Mesh *coarse_mesh, + struct SubdivCCG *subdiv_ccg); /* Subdivision integration, defined in multires_subdiv.c */ struct SubdivSettings; struct SubdivToMeshSettings; -void BKE_multires_subdiv_settings_init( - struct SubdivSettings *settings, - const struct MultiresModifierData *mmd); +void BKE_multires_subdiv_settings_init(struct SubdivSettings *settings, + const struct MultiresModifierData *mmd); /* TODO(sergey): Replace this set of boolean flags with bitmask. */ -void BKE_multires_subdiv_mesh_settings_init( - struct SubdivToMeshSettings *mesh_settings, - const struct Scene *scene, - const struct Object *object, - const struct MultiresModifierData *mmd, - const bool use_render_params, - const bool ignore_simplify); +void BKE_multires_subdiv_mesh_settings_init(struct SubdivToMeshSettings *mesh_settings, + const struct Scene *scene, + const struct Object *object, + const struct MultiresModifierData *mmd, + const bool use_render_params, + const bool ignore_simplify); /* General helpers. */ @@ -151,12 +175,11 @@ void BKE_multires_subdiv_mesh_settings_init( * Corner needs to be known to properly "rotate" partial derivatives when the * matrix is being constructed for quad. For non-quad the corner is to be set * to 0. */ -BLI_INLINE void BKE_multires_construct_tangent_matrix( - float tangent_matrix[3][3], - const float dPdu[3], - const float dPdv[3], - const int corner); +BLI_INLINE void BKE_multires_construct_tangent_matrix(float tangent_matrix[3][3], + const float dPdu[3], + const float dPdv[3], + const int corner); #include "intern/multires_inline.h" -#endif /* __BKE_MULTIRES_H__ */ +#endif /* __BKE_MULTIRES_H__ */ |