diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-01 12:02:58 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-01 19:02:17 +0300 |
commit | 6b9f1ffe6e56ee4d55f4cde5c724c31a3a90292b (patch) | |
tree | 59c6a3507baf9a975df36be26132695d048ec6c4 | |
parent | 2d6620a100e2e6e1835359688f4135771f660de1 (diff) |
Formatting
-rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 90 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_mirror.c | 2 |
2 files changed, 51 insertions, 41 deletions
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 09614a8e63f..c0203ddc630 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -276,8 +276,8 @@ typedef struct ModifierTypeInfo { * modified form), but must not release it. */ struct Mesh *(*applyModifier)(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct Mesh *mesh, - ModifierApplyFlag flag); + struct Object *ob, struct Mesh *mesh, + ModifierApplyFlag flag); /* Like applyModifier but called during editmode (for supporting * modifiers). @@ -287,8 +287,8 @@ typedef struct ModifierTypeInfo { * mesh apply as for applyModifier. */ struct Mesh *(*applyModifierEM)(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct BMEditMesh *editData, - struct Mesh *mesh, ModifierApplyFlag flag); + struct Object *ob, struct BMEditMesh *editData, + struct Mesh *mesh, ModifierApplyFlag flag); /********************* Optional functions *********************/ @@ -515,55 +515,65 @@ void modwrap_deformVertsEM( * depending on if the modifier has been ported to Mesh or is still using DerivedMesh */ -void modifier_deformVerts(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct Mesh *mesh, - float (*vertexCos)[3], int numVerts, - ModifierApplyFlag flag); +void modifier_deformVerts( + struct ModifierData *md, struct Depsgraph *depsgraph, + struct Object *ob, struct Mesh *mesh, + float (*vertexCos)[3], int numVerts, ModifierApplyFlag flag); -void modifier_deformMatrices(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct Mesh *mesh, - float (*vertexCos)[3], float (*defMats)[3][3], int numVerts); +void modifier_deformMatrices( + struct ModifierData *md, struct Depsgraph *depsgraph, + struct Object *ob, struct Mesh *mesh, + float (*vertexCos)[3], float (*defMats)[3][3], int numVerts); -void modifier_deformVertsEM(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct BMEditMesh *editData, struct Mesh *mesh, - float (*vertexCos)[3], int numVerts); +void modifier_deformVertsEM( + struct ModifierData *md, struct Depsgraph *depsgraph, + struct Object *ob, struct BMEditMesh *editData, struct Mesh *mesh, + float (*vertexCos)[3], int numVerts); -void modifier_deformMatricesEM(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct BMEditMesh *editData, struct Mesh *mesh, - float (*vertexCos)[3], float (*defMats)[3][3], int numVerts); +void modifier_deformMatricesEM( + struct ModifierData *md, struct Depsgraph *depsgraph, + struct Object *ob, struct BMEditMesh *editData, struct Mesh *mesh, + float (*vertexCos)[3], float (*defMats)[3][3], int numVerts); -struct Mesh *modifier_applyModifier(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct Mesh *mesh, ModifierApplyFlag flag); +struct Mesh *modifier_applyModifier( + struct ModifierData *md, struct Depsgraph *depsgraph, + struct Object *ob, struct Mesh *mesh, ModifierApplyFlag flag); -struct Mesh *modifier_applyModifierEM(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct BMEditMesh *editData, - struct Mesh *mesh, ModifierApplyFlag flag); +struct Mesh *modifier_applyModifierEM( + struct ModifierData *md, struct Depsgraph *depsgraph, + struct Object *ob, struct BMEditMesh *editData, + struct Mesh *mesh, ModifierApplyFlag flag); /* depricated variants of above that accept DerivedMesh */ -void modifier_deformVerts_DM_deprecated(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct DerivedMesh *dm, - float (*vertexCos)[3], int numVerts, - ModifierApplyFlag flag); +void modifier_deformVerts_DM_deprecated( + struct ModifierData *md, struct Depsgraph *depsgraph, + struct Object *ob, struct DerivedMesh *dm, + float (*vertexCos)[3], int numVerts, ModifierApplyFlag flag); -void modifier_deformMatrices_DM_deprecated(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct DerivedMesh *dm, - float (*vertexCos)[3], float (*defMats)[3][3], int numVerts); +void modifier_deformMatrices_DM_deprecated( + struct ModifierData *md, struct Depsgraph *depsgraph, + struct Object *ob, struct DerivedMesh *dm, + float (*vertexCos)[3], float (*defMats)[3][3], int numVerts); -void modifier_deformVertsEM_DM_deprecated(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct BMEditMesh *editData, struct DerivedMesh *dm, - float (*vertexCos)[3], int numVerts); +void modifier_deformVertsEM_DM_deprecated( + struct ModifierData *md, struct Depsgraph *depsgraph, + struct Object *ob, struct BMEditMesh *editData, struct DerivedMesh *dm, + float (*vertexCos)[3], int numVerts); -void modifier_deformMatricesEM_DM_deprecated(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct BMEditMesh *editData, struct DerivedMesh *dm, - float (*vertexCos)[3], float (*defMats)[3][3], int numVerts); +void modifier_deformMatricesEM_DM_deprecated( + struct ModifierData *md, struct Depsgraph *depsgraph, + struct Object *ob, struct BMEditMesh *editData, struct DerivedMesh *dm, + float (*vertexCos)[3], float (*defMats)[3][3], int numVerts); -struct DerivedMesh *modifier_applyModifier_DM_deprecated(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct DerivedMesh *dm, ModifierApplyFlag flag); +struct DerivedMesh *modifier_applyModifier_DM_deprecated( + struct ModifierData *md, struct Depsgraph *depsgraph, + struct Object *ob, struct DerivedMesh *dm, ModifierApplyFlag flag); -struct DerivedMesh *modifier_applyModifierEM_DM_deprecated(struct ModifierData *md, struct Depsgraph *depsgraph, - struct Object *ob, struct BMEditMesh *editData, - struct DerivedMesh *dm, ModifierApplyFlag flag); +struct DerivedMesh *modifier_applyModifierEM_DM_deprecated( + struct ModifierData *md, struct Depsgraph *depsgraph, + struct Object *ob, struct BMEditMesh *editData, + struct DerivedMesh *dm, ModifierApplyFlag flag); #endif diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 9b2d256157f..ff3d16a85be 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -300,7 +300,7 @@ static Mesh *doMirrorOnAxis(MirrorModifierData *mmd, } static Mesh *mirrorModifier__doMirror(MirrorModifierData *mmd, - Object *ob, Mesh *mesh) + Object *ob, Mesh *mesh) { Mesh *result = mesh; |