diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:21:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:22:03 +0300 |
| commit | 4dc91ebf81438c473bbd8f9a1655179335c6d42f (patch) | |
| tree | bf254664e6ffcec5e2a4f12417e5a6f0779c4f7e /source | |
| parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
| parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
54 files changed, 517 insertions, 386 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 26fe2ff2e4c..8f99bc2bf39 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -111,10 +111,11 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Armature Modifier"); } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - Mesh *mesh, - float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + Mesh *mesh, + float (*vertexCos)[3], + int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData *) md; @@ -169,8 +170,9 @@ static void deformMatricesEM( } } -static void deformMatrices(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, - float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) +static void deformMatrices( + ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, + float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData *) md; Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 532c6675d11..4a67b8318bb 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -742,8 +742,9 @@ static Mesh *arrayModifier_doArray( } -static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - Mesh *mesh) +static Mesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + Mesh *mesh) { ArrayModifierData *amd = (ArrayModifierData *) md; return arrayModifier_doArray(amd, ctx, mesh); diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index 8e7e2e65169..eb32c77ca1e 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -65,8 +65,9 @@ static bool dependsOnTime(ModifierData *UNUSED(md)) return true; } -static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - struct Mesh *mesh) +static Mesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + struct Mesh *mesh) { Mesh *result; BuildModifierData *bmd = (BuildModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index 2eee77c4dd7..5b6ad9b8f29 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -422,10 +422,11 @@ static void cuboid_do( } } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - Mesh *mesh, - float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + Mesh *mesh, + float (*vertexCos)[3], + int numVerts) { CastModifierData *cmd = (CastModifierData *)md; Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index cadb9e5dc96..268b0b22050 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -69,9 +69,10 @@ static void initData(ModifierData *md) cloth_init(clmd); } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *derivedData, float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *derivedData, float (*vertexCos)[3], + int numVerts) { DerivedMesh *dm; ClothModifierData *clmd = (ClothModifierData *) md; @@ -202,8 +203,9 @@ static void freeData(ModifierData *md) } } -static void foreachIDLink(ModifierData *md, Object *ob, - IDWalkFunc walk, void *userData) +static void foreachIDLink( + ModifierData *md, Object *ob, + IDWalkFunc walk, void *userData) { ClothModifierData *clmd = (ClothModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 6ec1f4d8e5c..83fbf676beb 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -95,10 +95,11 @@ static bool dependsOnTime(ModifierData *UNUSED(md)) return true; } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *derivedData, - float (*vertexCos)[3], - int UNUSED(numVerts)) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *derivedData, + float (*vertexCos)[3], + int UNUSED(numVerts)) { CollisionModifierData *collmd = (CollisionModifierData *) md; DerivedMesh *dm = NULL; diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c index 84a5b39e636..df5cd956000 100644 --- a/source/blender/modifiers/intern/MOD_correctivesmooth.c +++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c @@ -706,7 +706,8 @@ static void correctivesmooth_modifier_do( /* when the modifier fails to execute */ error: - MEM_SAFE_FREE(csmd->delta_cache); + MEM_SAFE_FREE( + csmd->delta_cache); csmd->delta_cache_num = 0; } diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index b004da7df6a..89ed8d627f1 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -79,8 +79,9 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) return dataMask; } -static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - Mesh *meshData) +static Mesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + Mesh *meshData) { DecimateModifierData *dmd = (DecimateModifierData *) md; Mesh *mesh = meshData, *result = NULL; diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 853787245a4..7997ccbfedc 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -108,16 +108,18 @@ static bool dependsOnNormals(ModifierData *md) return ELEM(dmd->direction, MOD_DISP_DIR_NOR, MOD_DISP_DIR_CLNOR); } -static void foreachObjectLink(ModifierData *md, Object *ob, - ObjectWalkFunc walk, void *userData) +static void foreachObjectLink( + ModifierData *md, Object *ob, + ObjectWalkFunc walk, void *userData) { DisplaceModifierData *dmd = (DisplaceModifierData *) md; walk(userData, ob, &dmd->map_object, IDWALK_CB_NOP); } -static void foreachIDLink(ModifierData *md, Object *ob, - IDWalkFunc walk, void *userData) +static void foreachIDLink( + ModifierData *md, Object *ob, + IDWalkFunc walk, void *userData) { DisplaceModifierData *dmd = (DisplaceModifierData *) md; @@ -126,8 +128,9 @@ static void foreachIDLink(ModifierData *md, Object *ob, foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData); } -static void foreachTexLink(ModifierData *md, Object *ob, - TexWalkFunc walk, void *userData) +static void foreachTexLink( + ModifierData *md, Object *ob, + TexWalkFunc walk, void *userData) { walk(userData, ob, md, "texture"); } diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index a45cb21139c..c7386f947ce 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -99,8 +99,9 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) return dataMask; } -static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *dm) +static DerivedMesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *dm) { DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md; @@ -137,8 +138,9 @@ static bool dependsOnTime(ModifierData *UNUSED(md)) return true; } -static void foreachIDLink(ModifierData *md, Object *ob, - IDWalkFunc walk, void *userData) +static void foreachIDLink( + ModifierData *md, Object *ob, + IDWalkFunc walk, void *userData) { DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md; @@ -155,8 +157,9 @@ static void foreachIDLink(ModifierData *md, Object *ob, } } -static void foreachTexLink(ModifierData *UNUSED(md), Object *UNUSED(ob), - TexWalkFunc UNUSED(walk), void *UNUSED(userData)) +static void foreachTexLink( + ModifierData *UNUSED(md), Object *UNUSED(ob), + TexWalkFunc UNUSED(walk), void *UNUSED(userData)) { //walk(userData, ob, md, ""); /* re-enable when possible */ } diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index d2e36c39816..e8ffddbde4e 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -124,9 +124,10 @@ static void initData(ModifierData *md) emd->flags = MOD_EDGESPLIT_FROMANGLE | MOD_EDGESPLIT_FROMFLAG; } -static Mesh *applyModifier(ModifierData *md, - const ModifierEvalContext *ctx, - Mesh *mesh) +static Mesh *applyModifier( + ModifierData *md, + const ModifierEvalContext *ctx, + Mesh *mesh) { Mesh *result; EdgeSplitModifierData *emd = (EdgeSplitModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index 4167d60a409..aab6c62ee7e 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -94,9 +94,10 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) return dataMask; } -static void createFacepa(ExplodeModifierData *emd, - ParticleSystemModifierData *psmd, - DerivedMesh *dm) +static void createFacepa( + ExplodeModifierData *emd, + ParticleSystemModifierData *psmd, + DerivedMesh *dm) { ParticleSystem *psys = psmd->psys; MFace *fa = NULL, *mface = NULL; @@ -995,8 +996,9 @@ static ParticleSystemModifierData *findPrecedingParticlesystem(Object *ob, Modif } return psmd; } -static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *derivedData) +static DerivedMesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *derivedData) { DerivedMesh *dm = derivedData; ExplodeModifierData *emd = (ExplodeModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c index bc01ca30203..dc9f0ec11aa 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim.c +++ b/source/blender/modifiers/intern/MOD_fluidsim.c @@ -85,8 +85,9 @@ static void copyData(const ModifierData *md, ModifierData *target) -static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *dm) +static DerivedMesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *dm) { FluidsimModifierData *fluidmd = (FluidsimModifierData *) md; DerivedMesh *result = NULL; diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index 07d0b48fdb4..1aed6309359 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -304,8 +304,9 @@ static DerivedMesh *fluidsim_read_obj(const char *filename, const MPoly *mp_exam } -void fluid_get_bb(MVert *mvert, int totvert, float obmat[4][4], - /*RET*/ float start[3], /*RET*/ float size[3]) +void fluid_get_bb( + MVert *mvert, int totvert, float obmat[4][4], + /*RET*/ float start[3], /*RET*/ float size[3]) { float bbsx = 0.0, bbsy = 0.0, bbsz = 0.0; float bbex = 1.0, bbey = 1.0, bbez = 1.0; @@ -425,8 +426,9 @@ static void fluidsim_read_vel_cache(FluidsimModifierData *fluidmd, DerivedMesh * gzclose(gzf); } -static DerivedMesh *fluidsim_read_cache(Object *ob, DerivedMesh *orgdm, - FluidsimModifierData *fluidmd, int framenr, int useRenderParams) +static DerivedMesh *fluidsim_read_cache( + Object *ob, DerivedMesh *orgdm, + FluidsimModifierData *fluidmd, int framenr, int useRenderParams) { int curFrame = framenr /* - 1 */ /*scene->r.sfra*/; /* start with 0 at start frame */ /* why start with 0 as start frame?? Animations + time are frozen for frame 0 anyway. (See physics_fluid.c for that. - DG */ @@ -509,10 +511,11 @@ static DerivedMesh *fluidsim_read_cache(Object *ob, DerivedMesh *orgdm, } #endif // WITH_MOD_FLUID -DerivedMesh *fluidsimModifier_do(FluidsimModifierData *fluidmd, Scene *scene, - Object *ob, - DerivedMesh *dm, - int useRenderParams, int UNUSED(isFinalCalc)) +DerivedMesh *fluidsimModifier_do( + FluidsimModifierData *fluidmd, Scene *scene, + Object *ob, + DerivedMesh *dm, + int useRenderParams, int UNUSED(isFinalCalc)) { #ifdef WITH_MOD_FLUID DerivedMesh *result = NULL; diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.h b/source/blender/modifiers/intern/MOD_fluidsim_util.h index 334826e618b..61ad270f6c8 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.h +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.h @@ -42,9 +42,10 @@ struct DerivedMesh; void fluidsim_init(struct FluidsimModifierData *fluidmd); void fluidsim_free(struct FluidsimModifierData *fluidmd); -struct DerivedMesh *fluidsimModifier_do(struct FluidsimModifierData *fluidmd, - struct Scene *scene, struct Object *ob, struct DerivedMesh *dm, - int useRenderParams, int isFinalCalc); +struct DerivedMesh *fluidsimModifier_do( + struct FluidsimModifierData *fluidmd, + struct Scene *scene, struct Object *ob, struct DerivedMesh *dm, + int useRenderParams, int isFinalCalc); #endif diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 0a2510ba2be..05fb6bb43bc 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -251,8 +251,9 @@ static void hook_co_apply(struct HookData_cb *hd, const int j) } } -static void deformVerts_do(HookModifierData *hmd, Object *ob, Mesh *mesh, - float (*vertexCos)[3], int numVerts) +static void deformVerts_do( + HookModifierData *hmd, Object *ob, Mesh *mesh, + float (*vertexCos)[3], int numVerts) { bPoseChannel *pchan = BKE_pose_channel_find_name(hmd->object->pose, hmd->subtarget); float dmat[4][4]; @@ -348,8 +349,9 @@ static void deformVerts_do(HookModifierData *hmd, Object *ob, Mesh *mesh, } } -static void deformVerts(struct ModifierData *md, const struct ModifierEvalContext *ctx, struct Mesh *mesh, - float (*vertexCos)[3], int numVerts) +static void deformVerts( + struct ModifierData *md, const struct ModifierEvalContext *ctx, struct Mesh *mesh, + float (*vertexCos)[3], int numVerts) { HookModifierData *hmd = (HookModifierData *)md; Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); @@ -361,9 +363,10 @@ static void deformVerts(struct ModifierData *md, const struct ModifierEvalContex } } -static void deformVertsEM(struct ModifierData *md, const struct ModifierEvalContext *ctx, - struct BMEditMesh *editData, - struct Mesh *mesh, float (*vertexCos)[3], int numVerts) +static void deformVertsEM( + struct ModifierData *md, const struct ModifierEvalContext *ctx, + struct BMEditMesh *editData, + struct Mesh *mesh, float (*vertexCos)[3], int numVerts) { HookModifierData *hmd = (HookModifierData *)md; Mesh *mesh_src = get_mesh(ctx->object, editData, mesh, NULL, false, false); diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.c b/source/blender/modifiers/intern/MOD_laplaciandeform.c index 83d5c915482..ae4eb042444 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.c +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c @@ -514,8 +514,9 @@ static bool isValidVertexGroup(LaplacianDeformModifierData *lmd, Object *ob, Mes return (dvert != NULL); } -static void initSystem(LaplacianDeformModifierData *lmd, Object *ob, Mesh *mesh, - float (*vertexCos)[3], int numVerts) +static void initSystem( + LaplacianDeformModifierData *lmd, Object *ob, Mesh *mesh, + float (*vertexCos)[3], int numVerts) { int i; int defgrp_index; @@ -729,8 +730,9 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) return dataMask; } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, - float (*vertexCos)[3], int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, + float (*vertexCos)[3], int numVerts) { Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index 5114657cfb1..04821b01e05 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -498,8 +498,9 @@ static CustomDataMask required_data_mask(Object *UNUSED(ob), ModifierData *md) return dataMask; } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, - float (*vertexCos)[3], int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, + float (*vertexCos)[3], int numVerts) { Mesh *mesh_src; diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index 9487841af95..219d08fc0f6 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -93,10 +93,11 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Lattice Modifier"); } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - struct Mesh *mesh, - float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + struct Mesh *mesh, + float (*vertexCos)[3], + int numVerts) { LatticeModifierData *lmd = (LatticeModifierData *) md; struct Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c index cc410f3cefb..5d8ac9e5638 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.c +++ b/source/blender/modifiers/intern/MOD_meshcache.c @@ -263,10 +263,11 @@ static void meshcache_do( } } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *derivedData, - float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *derivedData, + float (*vertexCos)[3], + int numVerts) { MeshCacheModifierData *mcmd = (MeshCacheModifierData *)md; diff --git a/source/blender/modifiers/intern/MOD_meshcache_mdd.c b/source/blender/modifiers/intern/MOD_meshcache_mdd.c index 3dd3a5fc598..f0278c409e5 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_mdd.c +++ b/source/blender/modifiers/intern/MOD_meshcache_mdd.c @@ -48,9 +48,10 @@ typedef struct MDDHead { int verts_tot; } MDDHead; /* frames, verts */ -static bool meshcache_read_mdd_head(FILE *fp, const int verts_tot, - MDDHead *mdd_head, - const char **err_str) +static bool meshcache_read_mdd_head( + FILE *fp, const int verts_tot, + MDDHead *mdd_head, + const char **err_str) { if (!fread(mdd_head, sizeof(*mdd_head), 1, fp)) { *err_str = "Missing header"; @@ -78,11 +79,12 @@ static bool meshcache_read_mdd_head(FILE *fp, const int verts_tot, /** * Gets the index frange and factor */ -static bool meshcache_read_mdd_range(FILE *fp, - const int verts_tot, - const float frame, const char interp, - int r_index_range[2], float *r_factor, - const char **err_str) +static bool meshcache_read_mdd_range( + FILE *fp, + const int verts_tot, + const float frame, const char interp, + int r_index_range[2], float *r_factor, + const char **err_str) { MDDHead mdd_head; @@ -97,11 +99,12 @@ static bool meshcache_read_mdd_range(FILE *fp, return true; } -static bool meshcache_read_mdd_range_from_time(FILE *fp, - const int verts_tot, - const float time, const float UNUSED(fps), - float *r_frame, - const char **err_str) +static bool meshcache_read_mdd_range_from_time( + FILE *fp, + const int verts_tot, + const float time, const float UNUSED(fps), + float *r_frame, + const char **err_str) { MDDHead mdd_head; int i; @@ -144,10 +147,11 @@ static bool meshcache_read_mdd_range_from_time(FILE *fp, return true; } -bool MOD_meshcache_read_mdd_index(FILE *fp, - float (*vertexCos)[3], const int verts_tot, - const int index, const float factor, - const char **err_str) +bool MOD_meshcache_read_mdd_index( + FILE *fp, + float (*vertexCos)[3], const int verts_tot, + const int index, const float factor, + const char **err_str) { MDDHead mdd_head; @@ -212,10 +216,11 @@ bool MOD_meshcache_read_mdd_index(FILE *fp, return true; } -bool MOD_meshcache_read_mdd_frame(FILE *fp, - float (*vertexCos)[3], const int verts_tot, const char interp, - const float frame, - const char **err_str) +bool MOD_meshcache_read_mdd_frame( + FILE *fp, + float (*vertexCos)[3], const int verts_tot, const char interp, + const float frame, + const char **err_str) { int index_range[2]; float factor; @@ -253,10 +258,11 @@ bool MOD_meshcache_read_mdd_frame(FILE *fp, } } -bool MOD_meshcache_read_mdd_times(const char *filepath, - float (*vertexCos)[3], const int verts_tot, const char interp, - const float time, const float fps, const char time_mode, - const char **err_str) +bool MOD_meshcache_read_mdd_times( + const char *filepath, + float (*vertexCos)[3], const int verts_tot, const char interp, + const float time, const float fps, const char time_mode, + const char **err_str) { float frame; diff --git a/source/blender/modifiers/intern/MOD_meshcache_pc2.c b/source/blender/modifiers/intern/MOD_meshcache_pc2.c index 4b2b3f17d18..3503ce3ef7a 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_pc2.c +++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.c @@ -52,9 +52,10 @@ typedef struct PC2Head { int frame_tot; } PC2Head; /* frames, verts */ -static bool meshcache_read_pc2_head(FILE *fp, const int verts_tot, - PC2Head *pc2_head, - const char **err_str) +static bool meshcache_read_pc2_head( + FILE *fp, const int verts_tot, + PC2Head *pc2_head, + const char **err_str) { if (!fread(pc2_head, sizeof(*pc2_head), 1, fp)) { *err_str = "Missing header"; @@ -90,11 +91,12 @@ static bool meshcache_read_pc2_head(FILE *fp, const int verts_tot, * * currently same as for MDD */ -static bool meshcache_read_pc2_range(FILE *fp, - const int verts_tot, - const float frame, const char interp, - int r_index_range[2], float *r_factor, - const char **err_str) +static bool meshcache_read_pc2_range( + FILE *fp, + const int verts_tot, + const float frame, const char interp, + int r_index_range[2], float *r_factor, + const char **err_str) { PC2Head pc2_head; @@ -109,11 +111,12 @@ static bool meshcache_read_pc2_range(FILE *fp, return true; } -static bool meshcache_read_pc2_range_from_time(FILE *fp, - const int verts_tot, - const float time, const float fps, - float *r_frame, - const char **err_str) +static bool meshcache_read_pc2_range_from_time( + FILE *fp, + const int verts_tot, + const float time, const float fps, + float *r_frame, + const char **err_str) { PC2Head pc2_head; float frame; @@ -135,10 +138,11 @@ static bool meshcache_read_pc2_range_from_time(FILE *fp, return true; } -bool MOD_meshcache_read_pc2_index(FILE *fp, - float (*vertexCos)[3], const int verts_tot, - const int index, const float factor, - const char **err_str) +bool MOD_meshcache_read_pc2_index( + FILE *fp, + float (*vertexCos)[3], const int verts_tot, + const int index, const float factor, + const char **err_str) { PC2Head pc2_head; @@ -188,10 +192,11 @@ bool MOD_meshcache_read_pc2_index(FILE *fp, } -bool MOD_meshcache_read_pc2_frame(FILE *fp, - float (*vertexCos)[3], const int verts_tot, const char interp, - const float frame, - const char **err_str) +bool MOD_meshcache_read_pc2_frame( + FILE *fp, + float (*vertexCos)[3], const int verts_tot, const char interp, + const float frame, + const char **err_str) { int index_range[2]; float factor; @@ -229,10 +234,11 @@ bool MOD_meshcache_read_pc2_frame(FILE *fp, } } -bool MOD_meshcache_read_pc2_times(const char *filepath, - float (*vertexCos)[3], const int verts_tot, const char interp, - const float time, const float fps, const char time_mode, - const char **err_str) +bool MOD_meshcache_read_pc2_times( + const char *filepath, + float (*vertexCos)[3], const int verts_tot, const char interp, + const float time, const float fps, const char time_mode, + const char **err_str) { float frame; diff --git a/source/blender/modifiers/intern/MOD_meshcache_util.c b/source/blender/modifiers/intern/MOD_meshcache_util.c index 10861f5b02b..f2e12e7749e 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_util.c +++ b/source/blender/modifiers/intern/MOD_meshcache_util.c @@ -31,9 +31,10 @@ #include "MOD_meshcache_util.h" -void MOD_meshcache_calc_range(const float frame, const char interp, - const int frame_tot, - int r_index_range[2], float *r_factor) +void MOD_meshcache_calc_range( + const float frame, const char interp, + const int frame_tot, + int r_index_range[2], float *r_factor) { if (interp == MOD_MESHCACHE_INTERP_NONE) { r_index_range[0] = r_index_range[1] = max_ii(0, min_ii(frame_tot - 1, round_fl_to_int(frame))); diff --git a/source/blender/modifiers/intern/MOD_meshcache_util.h b/source/blender/modifiers/intern/MOD_meshcache_util.h index 241806f49e1..8cf13037d78 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_util.h +++ b/source/blender/modifiers/intern/MOD_meshcache_util.h @@ -29,37 +29,44 @@ /* MOD_meshcache_mdd.c */ -bool MOD_meshcache_read_mdd_index(FILE *fp, - float (*vertexCos)[3], const int vertex_tot, - const int index, const float factor, - const char **err_str); -bool MOD_meshcache_read_mdd_frame(FILE *fp, - float (*vertexCos)[3], const int verts_tot, const char interp, - const float frame, - const char **err_str); -bool MOD_meshcache_read_mdd_times(const char *filepath, - float (*vertexCos)[3], const int verts_tot, const char interp, - const float time, const float fps, const char time_mode, - const char **err_str); +bool MOD_meshcache_read_mdd_index( + FILE *fp, + float (*vertexCos)[3], const int vertex_tot, + const int index, const float factor, + const char **err_str); +bool MOD_meshcache_read_mdd_frame( + FILE *fp, + float (*vertexCos)[3], const int verts_tot, const char interp, + const float frame, + const char **err_str); +bool MOD_meshcache_read_mdd_times( + const char *filepath, + float (*vertexCos)[3], const int verts_tot, const char interp, + const float time, const float fps, const char time_mode, + const char **err_str); /* MOD_meshcache_pc2.c */ -bool MOD_meshcache_read_pc2_index(FILE *fp, - float (*vertexCos)[3], const int verts_tot, - const int index, const float factor, - const char **err_str); -bool MOD_meshcache_read_pc2_frame(FILE *fp, - float (*vertexCos)[3], const int verts_tot, const char interp, - const float frame, - const char **err_str); -bool MOD_meshcache_read_pc2_times(const char *filepath, - float (*vertexCos)[3], const int verts_tot, const char interp, - const float time, const float fps, const char time_mode, - const char **err_str); +bool MOD_meshcache_read_pc2_index( + FILE *fp, + float (*vertexCos)[3], const int verts_tot, + const int index, const float factor, + const char **err_str); +bool MOD_meshcache_read_pc2_frame( + FILE *fp, + float (*vertexCos)[3], const int verts_tot, const char interp, + const float frame, + const char **err_str); +bool MOD_meshcache_read_pc2_times( + const char *filepath, + float (*vertexCos)[3], const int verts_tot, const char interp, + const float time, const float fps, const char time_mode, + const char **err_str); /* MOD_meshcache_util.c */ -void MOD_meshcache_calc_range(const float frame, const char interp, - const int frame_tot, - int r_index_range[2], float *r_factor); +void MOD_meshcache_calc_range( + const float frame, const char interp, + const int frame_tot, + int r_index_range[2], float *r_factor); #define FRAME_SNAP_EPS 0.0001f diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index 1e6fa0664df..26761d8ef91 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -411,10 +411,11 @@ static void meshdeformModifier_do( if (free_cagemesh) BKE_id_free(NULL, cagemesh); } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - Mesh *mesh, - float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + Mesh *mesh, + float (*vertexCos)[3], + int numVerts) { Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); @@ -427,11 +428,12 @@ static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, } } -static void deformVertsEM(ModifierData *md, const ModifierEvalContext *ctx, - struct BMEditMesh *UNUSED(editData), - Mesh *mesh, - float (*vertexCos)[3], - int numVerts) +static void deformVertsEM( + ModifierData *md, const ModifierEvalContext *ctx, + struct BMEditMesh *UNUSED(editData), + Mesh *mesh, + float (*vertexCos)[3], + int numVerts) { Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c index 26ea7af9764..595b91f25a2 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.c +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c @@ -87,8 +87,9 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams)) return (mcmd->cache_file == NULL) || (mcmd->object_path[0] == '\0'); } -static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *dm) +static DerivedMesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *dm) { #ifdef WITH_ALEMBIC MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md; @@ -156,8 +157,9 @@ static bool dependsOnTime(ModifierData *md) return true; } -static void foreachIDLink(ModifierData *md, Object *ob, - IDWalkFunc walk, void *userData) +static void foreachIDLink( + ModifierData *md, Object *ob, + IDWalkFunc walk, void *userData) { MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 36d610fa685..892092f844b 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -78,10 +78,11 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Mirror Modifier"); } -static Mesh *doMirrorOnAxis(MirrorModifierData *mmd, - Object *ob, - const Mesh *mesh, - int axis) +static Mesh *doMirrorOnAxis( + MirrorModifierData *mmd, + Object *ob, + const Mesh *mesh, + int axis) { const float tolerance_sq = mmd->tolerance * mmd->tolerance; const bool do_vtargetmap = (mmd->flag & MOD_MIR_NO_MERGE) == 0; @@ -292,8 +293,9 @@ static Mesh *doMirrorOnAxis(MirrorModifierData *mmd, return result; } -static Mesh *mirrorModifier__doMirror(MirrorModifierData *mmd, - Object *ob, Mesh *mesh) +static Mesh *mirrorModifier__doMirror( + MirrorModifierData *mmd, + Object *ob, Mesh *mesh) { Mesh *result = mesh; @@ -321,8 +323,9 @@ static Mesh *mirrorModifier__doMirror(MirrorModifierData *mmd, return result; } -static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - Mesh *mesh) +static Mesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + Mesh *mesh) { Mesh *result; MirrorModifierData *mmd = (MirrorModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c index 17336c2a723..c263c2e3f5d 100644 --- a/source/blender/modifiers/intern/MOD_multires.c +++ b/source/blender/modifiers/intern/MOD_multires.c @@ -58,8 +58,9 @@ static void initData(ModifierData *md) mmd->totlvl = 0; } -static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *dm) +static DerivedMesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *dm) { MultiresModifierData *mmd = (MultiresModifierData *)md; DerivedMesh *result; diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index debd2fb6b46..728802882a9 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -403,9 +403,10 @@ static DerivedMesh *generate_ocean_geometry(OceanModifierData *omd) return result; } -static DerivedMesh *doOcean(ModifierData *md, Object *ob, - DerivedMesh *derivedData, - int UNUSED(useRenderParams)) +static DerivedMesh *doOcean( + ModifierData *md, Object *ob, + DerivedMesh *derivedData, + int UNUSED(useRenderParams)) { OceanModifierData *omd = (OceanModifierData *) md; @@ -543,9 +544,10 @@ static DerivedMesh *doOcean(ModifierData *md, Object *ob, return dm; } #else /* WITH_OCEANSIM */ -static DerivedMesh *doOcean(ModifierData *md, Object *UNUSED(ob), - DerivedMesh *derivedData, - int UNUSED(useRenderParams)) +static DerivedMesh *doOcean( + ModifierData *md, Object *UNUSED(ob), + DerivedMesh *derivedData, + int UNUSED(useRenderParams)) { /* unused */ (void)md; @@ -553,8 +555,9 @@ static DerivedMesh *doOcean(ModifierData *md, Object *UNUSED(ob), } #endif /* WITH_OCEANSIM */ -static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *derivedData) +static DerivedMesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *derivedData) { DerivedMesh *result; diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 5b03677ad93..3a781a58634 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -131,8 +131,9 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte } } -static void foreachObjectLink(ModifierData *md, Object *ob, - ObjectWalkFunc walk, void *userData) +static void foreachObjectLink( + ModifierData *md, Object *ob, + ObjectWalkFunc walk, void *userData) { ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *) md; @@ -194,8 +195,9 @@ static void store_float_in_vcol(MLoopCol *vcol, float float_value) vcol->a = 1.0f; } -static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *derivedData) +static DerivedMesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *derivedData) { DerivedMesh *dm = derivedData, *result; ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index a2add591938..ad24ce92626 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -99,10 +99,11 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) } /* saves the current emitter state for a particle system and calculates particles */ -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *derivedData, - float (*vertexCos)[3], - int UNUSED(numVerts)) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *derivedData, + float (*vertexCos)[3], + int UNUSED(numVerts)) { DerivedMesh *dm = derivedData; ParticleSystemModifierData *psmd = (ParticleSystemModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index 3ee69deb8b2..454b6b3aa82 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -133,9 +133,10 @@ static void dualcon_add_quad(void *output_v, const int vert_indices[4]) output->curface++; } -static DerivedMesh *applyModifier(ModifierData *md, - const ModifierEvalContext *UNUSED(ctx), - DerivedMesh *dm) +static DerivedMesh *applyModifier( + ModifierData *md, + const ModifierEvalContext *UNUSED(ctx), + DerivedMesh *dm) { RemeshModifierData *rmd; DualConOutput *output; @@ -193,9 +194,10 @@ static DerivedMesh *applyModifier(ModifierData *md, #else /* !WITH_MOD_REMESH */ -static DerivedMesh *applyModifier(ModifierData *UNUSED(md), - const ModifierEvalContext *UNUSED(ctx), - DerivedMesh *derivedData) +static DerivedMesh *applyModifier( + ModifierData *UNUSED(md), + const ModifierEvalContext *UNUSED(ctx), + DerivedMesh *derivedData) { return derivedData; } diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 629c3c3b0b2..32b0894e946 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -177,8 +177,9 @@ static void initData(ModifierData *md) ltmd->merge_dist = 0.01f; } -static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - Mesh *meshData) +static Mesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + Mesh *meshData) { Mesh *mesh = meshData; Mesh *result; diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index 8c4664414d5..90c339361b7 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -44,10 +44,11 @@ #include "MOD_modifiertypes.h" -static void deformVerts(ModifierData *UNUSED(md), const ModifierEvalContext *ctx, - DerivedMesh *UNUSED(derivedData), - float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *UNUSED(md), const ModifierEvalContext *ctx, + DerivedMesh *UNUSED(derivedData), + float (*vertexCos)[3], + int numVerts) { Key *key = BKE_key_from_object(ctx->object); @@ -60,8 +61,9 @@ static void deformVerts(ModifierData *UNUSED(md), const ModifierEvalContext *ctx } } -static void deformMatrices(ModifierData *md, const ModifierEvalContext *ctx, DerivedMesh *derivedData, - float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) +static void deformMatrices( + ModifierData *md, const ModifierEvalContext *ctx, DerivedMesh *derivedData, + float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) { Key *key = BKE_key_from_object(ctx->object); KeyBlock *kb = BKE_keyblock_from_object(ctx->object); @@ -82,11 +84,12 @@ static void deformMatrices(ModifierData *md, const ModifierEvalContext *ctx, Der deformVerts(md, ctx, derivedData, vertexCos, numVerts); } -static void deformVertsEM(ModifierData *md, const ModifierEvalContext *ctx, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData, - float (*vertexCos)[3], - int numVerts) +static void deformVertsEM( + ModifierData *md, const ModifierEvalContext *ctx, + struct BMEditMesh *UNUSED(editData), + DerivedMesh *derivedData, + float (*vertexCos)[3], + int numVerts) { Key *key = BKE_key_from_object(ctx->object); @@ -94,12 +97,13 @@ static void deformVertsEM(ModifierData *md, const ModifierEvalContext *ctx, deformVerts(md, ctx, derivedData, vertexCos, numVerts); } -static void deformMatricesEM(ModifierData *UNUSED(md), const ModifierEvalContext *ctx, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *UNUSED(derivedData), - float (*vertexCos)[3], - float (*defMats)[3][3], - int numVerts) +static void deformMatricesEM( + ModifierData *UNUSED(md), const ModifierEvalContext *ctx, + struct BMEditMesh *UNUSED(editData), + DerivedMesh *UNUSED(derivedData), + float (*vertexCos)[3], + float (*defMats)[3][3], + int numVerts) { Key *key = BKE_key_from_object(ctx->object); KeyBlock *kb = BKE_keyblock_from_object(ctx->object); diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index c3ce036847f..1e503f41310 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -97,10 +97,11 @@ static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, walk(userData, ob, &smd->auxTarget, IDWALK_CB_NOP); } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - Mesh *mesh, - float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + Mesh *mesh, + float (*vertexCos)[3], + int numVerts) { Mesh *mesh_src = mesh; @@ -113,9 +114,10 @@ static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, shrinkwrapModifier_deform((ShrinkwrapModifierData *)md, ctx->object, mesh_src, vertexCos, numVerts, ctx); } -static void deformVertsEM(ModifierData *md, const ModifierEvalContext *ctx, - struct BMEditMesh *editData, Mesh *mesh, - float (*vertexCos)[3], int numVerts) +static void deformVertsEM( + ModifierData *md, const ModifierEvalContext *ctx, + struct BMEditMesh *editData, Mesh *mesh, + float (*vertexCos)[3], int numVerts) { Mesh *mesh_src = mesh; diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index f054c89ea90..3f62351bceb 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -186,8 +186,9 @@ static void simpleDeform_bend(const float factor, const int axis, const float dc /* simple deform modifier */ -static void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object *ob, struct Mesh *mesh, - float (*vertexCos)[3], int numVerts) +static void SimpleDeformModifier_do( + SimpleDeformModifierData *smd, struct Object *ob, struct Mesh *mesh, + float (*vertexCos)[3], int numVerts) { const float base_limit[2] = {0.0f, 0.0f}; int i; @@ -379,10 +380,11 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte } } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - struct Mesh *mesh, - float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + struct Mesh *mesh, + float (*vertexCos)[3], + int numVerts) { Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); @@ -393,11 +395,12 @@ static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, } } -static void deformVertsEM(ModifierData *md, const ModifierEvalContext *ctx, - struct BMEditMesh *editData, - struct Mesh *mesh, - float (*vertexCos)[3], - int numVerts) +static void deformVertsEM( + ModifierData *md, const ModifierEvalContext *ctx, + struct BMEditMesh *editData, + struct Mesh *mesh, + float (*vertexCos)[3], + int numVerts) { Mesh *mesh_src = get_mesh(ctx->object, editData, mesh, NULL, false, false); diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index 60c324668d5..5e2cdd71a10 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -134,16 +134,18 @@ typedef struct { int mat_nr; } SkinOutput; -static void add_poly(SkinOutput *so, - BMVert *v1, - BMVert *v2, - BMVert *v3, - BMVert *v4); +static void add_poly( + SkinOutput *so, + BMVert *v1, + BMVert *v2, + BMVert *v3, + BMVert *v4); /***************************** Convex Hull ****************************/ -static bool is_quad_symmetric(BMVert *quad[4], - const SkinModifierData *smd) +static bool is_quad_symmetric( + BMVert *quad[4], + const SkinModifierData *smd) { const float threshold = 0.0001f; const float threshold_squared = threshold * threshold; @@ -175,8 +177,9 @@ static bool is_quad_symmetric(BMVert *quad[4], } /* Returns true if the quad crosses the plane of symmetry, false otherwise */ -static bool quad_crosses_symmetry_plane(BMVert *quad[4], - const SkinModifierData *smd) +static bool quad_crosses_symmetry_plane( + BMVert *quad[4], + const SkinModifierData *smd) { int axis; @@ -202,8 +205,9 @@ static bool quad_crosses_symmetry_plane(BMVert *quad[4], /* Returns true if the frame is filled by precisely two faces (and * outputs those faces to fill_faces), otherwise returns false. */ -static bool skin_frame_find_contained_faces(const Frame *frame, - BMFace *fill_faces[2]) +static bool skin_frame_find_contained_faces( + const Frame *frame, + BMFace *fill_faces[2]) { BMEdge *diag; @@ -410,9 +414,10 @@ static void merge_frame_corners(Frame **frames, int totframe) } } -static Frame **collect_hull_frames(int v, SkinNode *frames, - const MeshElemMap *emap, const MEdge *medge, - int *tothullframe) +static Frame **collect_hull_frames( + int v, SkinNode *frames, + const MeshElemMap *emap, const MEdge *medge, + int *tothullframe) { SkinNode *f; Frame **hull_frames; @@ -450,9 +455,10 @@ static void node_frames_init(SkinNode *nf, int totframe) nf->seam_edges[i] = -1; } -static void create_frame(Frame *frame, const float co[3], - const float radius[2], - float mat[3][3], float offset) +static void create_frame( + Frame *frame, const float co[3], + const float radius[2], + float mat[3][3], float offset) { float rx[3], ry[3], rz[3]; int i; @@ -482,9 +488,10 @@ static float half_v2(const float v[2]) return (v[0] + v[1]) * 0.5f; } -static void end_node_frames(int v, SkinNode *skin_nodes, const MVert *mvert, - const MVertSkin *nodes, const MeshElemMap *emap, - EMat *emat) +static void end_node_frames( + int v, SkinNode *skin_nodes, const MVert *mvert, + const MVertSkin *nodes, const MeshElemMap *emap, + EMat *emat) { const float *rad = nodes[v].radius; float mat[3][3]; @@ -555,9 +562,10 @@ static int connection_node_mat(float mat[3][3], int v, const MeshElemMap *emap, return 0; } -static void connection_node_frames(int v, SkinNode *skin_nodes, const MVert *mvert, - const MVertSkin *nodes, const MeshElemMap *emap, - EMat *emat) +static void connection_node_frames( + int v, SkinNode *skin_nodes, const MVert *mvert, + const MVertSkin *nodes, const MeshElemMap *emap, + EMat *emat) { const float *rad = nodes[v].radius; float mat[3][3]; @@ -593,9 +601,10 @@ static void connection_node_frames(int v, SkinNode *skin_nodes, const MVert *mve create_frame(&skin_nodes[v].frames[0], mvert[v].co, rad, mat, 0); } -static SkinNode *build_frames(const MVert *mvert, int totvert, - const MVertSkin *nodes, const MeshElemMap *emap, - EMat *emat) +static SkinNode *build_frames( + const MVert *mvert, int totvert, + const MVertSkin *nodes, const MeshElemMap *emap, + EMat *emat) { SkinNode *skin_nodes; int v; @@ -652,9 +661,10 @@ typedef struct { int e; } EdgeStackElem; -static void build_emats_stack(BLI_Stack *stack, BLI_bitmap *visited_e, EMat *emat, - const MeshElemMap *emap, const MEdge *medge, - const MVertSkin *vs, const MVert *mvert) +static void build_emats_stack( + BLI_Stack *stack, BLI_bitmap *visited_e, EMat *emat, + const MeshElemMap *emap, const MEdge *medge, + const MVertSkin *vs, const MVert *mvert) { EdgeStackElem stack_elem; float axis[3], angle; @@ -705,13 +715,14 @@ static void build_emats_stack(BLI_Stack *stack, BLI_bitmap *visited_e, EMat *ema } } -static EMat *build_edge_mats(const MVertSkin *vs, - const MVert *mvert, - int totvert, - const MEdge *medge, - const MeshElemMap *emap, - int totedge, - bool *has_valid_root) +static EMat *build_edge_mats( + const MVertSkin *vs, + const MVert *mvert, + int totvert, + const MEdge *medge, + const MeshElemMap *emap, + int totedge, + bool *has_valid_root) { BLI_Stack *stack; EMat *emat; @@ -763,8 +774,9 @@ static EMat *build_edge_mats(const MVertSkin *vs, * nodes, at least two intermediate frames are required. (This avoids * having any special cases for dealing with sharing a frame between * two hulls.) */ -static int calc_edge_subdivisions(const MVert *mvert, const MVertSkin *nodes, - const MEdge *e, const int *degree) +static int calc_edge_subdivisions( + const MVert *mvert, const MVertSkin *nodes, + const MEdge *e, const int *degree) { /* prevent memory errors [#38003] */ #define NUM_SUBDIVISIONS_MAX 128 @@ -956,11 +968,12 @@ static Mesh *subdivide_base(Mesh *orig) /******************************* Output *******************************/ /* Can be either quad or triangle */ -static void add_poly(SkinOutput *so, - BMVert *v1, - BMVert *v2, - BMVert *v3, - BMVert *v4) +static void add_poly( + SkinOutput *so, + BMVert *v1, + BMVert *v2, + BMVert *v3, + BMVert *v4) { BMVert *verts[4] = {v1, v2, v3, v4}; BMFace *f; @@ -1031,9 +1044,10 @@ static void connect_frames( } } -static void output_frames(BMesh *bm, - SkinNode *sn, - const MDeformVert *input_dvert) +static void output_frames( + BMesh *bm, + SkinNode *sn, + const MDeformVert *input_dvert) { Frame *f; int i, j; diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index befa1e3d381..44b013c2bb5 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -102,8 +102,9 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) return dataMask; } -static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *dm) +static DerivedMesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *dm) { SmokeModifierData *smd = (SmokeModifierData *) md; @@ -143,8 +144,9 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte } } -static void foreachIDLink(ModifierData *md, Object *ob, - IDWalkFunc walk, void *userData) +static void foreachIDLink( + ModifierData *md, Object *ob, + IDWalkFunc walk, void *userData) { SmokeModifierData *smd = (SmokeModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index fdf1e9da6bc..a8a1692b158 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -209,8 +209,9 @@ static void smoothModifier_do( MEM_freeN(uctmp); } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, - float (*vertexCos)[3], int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, + float (*vertexCos)[3], int numVerts) { Mesh *mesh_src = mesh; diff --git a/source/blender/modifiers/intern/MOD_softbody.c b/source/blender/modifiers/intern/MOD_softbody.c index 885c355254d..a62b21df231 100644 --- a/source/blender/modifiers/intern/MOD_softbody.c +++ b/source/blender/modifiers/intern/MOD_softbody.c @@ -49,10 +49,11 @@ #include "MOD_modifiertypes.h" -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *UNUSED(derivedData), - float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *UNUSED(derivedData), + float (*vertexCos)[3], + int numVerts) { sbObjectStep(ctx->depsgraph, md->scene, ctx->object, (float)md->scene->r.cfra, vertexCos, numVerts); } diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index 0d0d70ec33d..c4eb99840fb 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -99,8 +99,9 @@ static bool isDisabled(ModifierData *md, int useRenderParams) return get_render_subsurf_level(&md->scene->r, levels, useRenderParams != 0) == 0; } -static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *derivedData) +static DerivedMesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *derivedData) { SubsurfModifierData *smd = (SubsurfModifierData *) md; SubsurfFlags subsurf_flags = 0; diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index d1ff6ff9573..c05d021a845 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -82,10 +82,11 @@ static bool dependsOnTime(ModifierData *UNUSED(md)) return true; } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *derivedData, - float (*vertexCos)[3], - int UNUSED(numVerts)) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *derivedData, + float (*vertexCos)[3], + int UNUSED(numVerts)) { SurfaceModifierData *surmd = (SurfaceModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 23128e10ef2..ab0b31812b2 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -188,8 +188,9 @@ static void freeAdjacencyMap(SDefAdjacencyArray * const vert_edges, SDefAdjacenc MEM_freeN(vert_edges); } -static int buildAdjacencyMap(const MPoly *poly, const MEdge *edge, const MLoop * const mloop, const unsigned int numpoly, const unsigned int numedges, - SDefAdjacencyArray * const vert_edges, SDefAdjacency *adj, SDefEdgePolys * const edge_polys) +static int buildAdjacencyMap( + const MPoly *poly, const MEdge *edge, const MLoop * const mloop, const unsigned int numpoly, const unsigned int numedges, + SDefAdjacencyArray * const vert_edges, SDefAdjacency *adj, SDefEdgePolys * const edge_polys) { const MLoop *loop; @@ -908,8 +909,9 @@ static void bindVert( freeBindData(bwdata); } -static bool surfacedeformBind(SurfaceDeformModifierData *smd, float (*vertexCos)[3], - unsigned int numverts, unsigned int tnumpoly, unsigned int tnumverts, Mesh *target) +static bool surfacedeformBind( + SurfaceDeformModifierData *smd, float (*vertexCos)[3], + unsigned int numverts, unsigned int tnumpoly, unsigned int tnumverts, Mesh *target) { BVHTreeFromMesh treeData = {NULL}; const MVert *mvert = target->mvert; diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c index 4d71b59bf31..d845246e1a1 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.c +++ b/source/blender/modifiers/intern/MOD_triangulate.c @@ -79,9 +79,10 @@ static void initData(ModifierData *md) tmd->ngon_method = MOD_TRIANGULATE_NGON_BEAUTY; } -static Mesh *applyModifier(ModifierData *md, - const ModifierEvalContext *UNUSED(ctx), - Mesh *mesh) +static Mesh *applyModifier( + ModifierData *md, + const ModifierEvalContext *UNUSED(ctx), + Mesh *mesh) { TriangulateModifierData *tmd = (TriangulateModifierData *)md; Mesh *result; diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index 818c13b4e44..6de0cd753cd 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -152,10 +152,11 @@ void get_texture_coords_mesh( } } -void get_texture_coords(MappingInfoModifierData *dmd, Object *ob, - DerivedMesh *dm, - float (*co)[3], float (*texco)[3], - int numVerts) +void get_texture_coords( + MappingInfoModifierData *dmd, Object *ob, + DerivedMesh *dm, + float (*co)[3], float (*texco)[3], + int numVerts) { int i; int texmapping = dmd->texmapping; @@ -257,8 +258,9 @@ DerivedMesh *get_cddm(Object *ob, struct BMEditMesh *em, DerivedMesh *dm, float } /* returns a derived mesh if dm == NULL, for deforming modifiers that need it */ -DerivedMesh *get_dm(Object *ob, struct BMEditMesh *em, DerivedMesh *dm, - float (*vertexCos)[3], bool use_normals, bool use_orco) +DerivedMesh *get_dm( + Object *ob, struct BMEditMesh *em, DerivedMesh *dm, + float (*vertexCos)[3], bool use_normals, bool use_orco) { if (dm) { /* pass */ @@ -290,8 +292,9 @@ DerivedMesh *get_dm(Object *ob, struct BMEditMesh *em, DerivedMesh *dm, } /* returns a mesh if mesh == NULL, for deforming modifiers that need it */ -Mesh *get_mesh(Object *ob, struct BMEditMesh *em, Mesh *mesh, - float (*vertexCos)[3], bool use_normals, bool use_orco) +Mesh *get_mesh( + Object *ob, struct BMEditMesh *em, Mesh *mesh, + float (*vertexCos)[3], bool use_normals, bool use_orco) { if (mesh) { /* pass */ diff --git a/source/blender/modifiers/intern/MOD_util.h b/source/blender/modifiers/intern/MOD_util.h index 545ae3264db..4ca13e164fb 100644 --- a/source/blender/modifiers/intern/MOD_util.h +++ b/source/blender/modifiers/intern/MOD_util.h @@ -42,8 +42,9 @@ struct Scene; struct Tex; void modifier_init_texture(const struct Scene *scene, struct Tex *texture); -void get_texture_coords(struct MappingInfoModifierData *dmd, struct Object *ob, struct DerivedMesh *dm, - float (*co)[3], float (*texco)[3], int numVerts); +void get_texture_coords( + struct MappingInfoModifierData *dmd, struct Object *ob, struct DerivedMesh *dm, + float (*co)[3], float (*texco)[3], int numVerts); void get_texture_coords_mesh( struct MappingInfoModifierData *dmd, struct Object *ob, @@ -51,17 +52,22 @@ void get_texture_coords_mesh( float (*cos)[3], float (*r_texco)[3]); void modifier_vgroup_cache(struct ModifierData *md, float (*vertexCos)[3]); -struct DerivedMesh *get_cddm(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, - float (*vertexCos)[3], bool use_normals); -struct DerivedMesh *get_dm(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, - float (*vertexCos)[3], bool use_normals, bool use_orco); -struct Mesh *get_mesh(struct Object *ob, struct BMEditMesh *em, struct Mesh *mesh, - float (*vertexCos)[3], bool use_normals, bool use_orco); +struct DerivedMesh *get_cddm( + struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, + float (*vertexCos)[3], bool use_normals); +struct DerivedMesh *get_dm( + struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, + float (*vertexCos)[3], bool use_normals, bool use_orco); +struct Mesh *get_mesh( + struct Object *ob, struct BMEditMesh *em, struct Mesh *mesh, + float (*vertexCos)[3], bool use_normals, bool use_orco); struct DerivedMesh *get_dm_for_modifier(struct Object *ob, ModifierApplyFlag flag); -void modifier_get_vgroup(struct Object *ob, struct DerivedMesh *dm, - const char *name, struct MDeformVert **dvert, int *defgrp_index); -void modifier_get_vgroup_mesh(struct Object *ob, struct Mesh *mesh, - const char *name, struct MDeformVert **dvert, int *defgrp_index); +void modifier_get_vgroup( + struct Object *ob, struct DerivedMesh *dm, + const char *name, struct MDeformVert **dvert, int *defgrp_index); +void modifier_get_vgroup_mesh( + struct Object *ob, struct Mesh *mesh, + const char *name, struct MDeformVert **dvert, int *defgrp_index); #endif /* __MOD_UTIL_H__ */ diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 2087a1f7a1a..207c692071c 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -77,8 +77,9 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED( return dataMask; } -static void foreachObjectLink(ModifierData *md, Object *ob, - ObjectWalkFunc walk, void *userData) +static void foreachObjectLink( + ModifierData *md, Object *ob, + ObjectWalkFunc walk, void *userData) { UVProjectModifierData *umd = (UVProjectModifierData *) md; int i; @@ -87,8 +88,9 @@ static void foreachObjectLink(ModifierData *md, Object *ob, walk(userData, ob, &umd->projectors[i], IDWALK_CB_NOP); } -static void foreachIDLink(ModifierData *md, Object *ob, - IDWalkFunc walk, void *userData) +static void foreachIDLink( + ModifierData *md, Object *ob, + IDWalkFunc walk, void *userData) { #if 0 UVProjectModifierData *umd = (UVProjectModifierData *) md; @@ -115,8 +117,9 @@ typedef struct Projector { void *uci; /* optional uv-project info (panorama projection) */ } Projector; -static Mesh *uvprojectModifier_do(UVProjectModifierData *umd, - Object *ob, Mesh *mesh) +static Mesh *uvprojectModifier_do( + UVProjectModifierData *umd, + Object *ob, Mesh *mesh) { float (*coords)[3], (*co)[3]; MLoopUV *mloop_uv; @@ -302,8 +305,9 @@ static Mesh *uvprojectModifier_do(UVProjectModifierData *umd, return mesh; } -static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - Mesh *mesh) +static Mesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + Mesh *mesh) { Mesh *result; UVProjectModifierData *umd = (UVProjectModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_uvwarp.c b/source/blender/modifiers/intern/MOD_uvwarp.c index 9ca117c4232..c650ae995db 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.c +++ b/source/blender/modifiers/intern/MOD_uvwarp.c @@ -43,8 +43,9 @@ #include "MOD_util.h" -static void uv_warp_from_mat4_pair(float uv_dst[2], const float uv_src[2], float warp_mat[4][4], - int axis_u, int axis_v) +static void uv_warp_from_mat4_pair( + float uv_dst[2], const float uv_src[2], float warp_mat[4][4], + int axis_u, int axis_v) { float tuv[3] = {0.0f}; @@ -137,8 +138,9 @@ static void uv_warp_compute( } } -static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *dm) +static DerivedMesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *dm) { UVWarpModifierData *umd = (UVWarpModifierData *) md; int numPolys, numLoops; @@ -222,9 +224,10 @@ static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, walk(userData, ob, &umd->object_src, IDWALK_CB_NOP); } -static void uv_warp_deps_object_bone_new(struct DepsNodeHandle *node, - Object *object, - const char *bonename) +static void uv_warp_deps_object_bone_new( + struct DepsNodeHandle *node, + Object *object, + const char *bonename) { if (object != NULL) { if (bonename[0]) diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index 34e69f570d5..f6585521269 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -148,8 +148,9 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte } } -static void warpModifier_do(WarpModifierData *wmd, Object *ob, - Mesh *mesh, float (*vertexCos)[3], int numVerts) +static void warpModifier_do( + WarpModifierData *wmd, Object *ob, + Mesh *mesh, float (*vertexCos)[3], int numVerts) { float obinv[4][4]; float mat_from[4][4]; @@ -303,8 +304,9 @@ static void warpModifier_do(WarpModifierData *wmd, Object *ob, } } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, - float (*vertexCos)[3], int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, + float (*vertexCos)[3], int numVerts) { Mesh *mesh_src = mesh; @@ -317,8 +319,9 @@ static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, Mesh * warpModifier_do((WarpModifierData *)md, ctx->object, mesh_src, vertexCos, numVerts); } -static void deformVertsEM(ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *em, - Mesh *mesh, float (*vertexCos)[3], int numVerts) +static void deformVertsEM( + ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *em, + Mesh *mesh, float (*vertexCos)[3], int numVerts) { Mesh *mesh_src = mesh; diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index f558d3fc5bd..cda0c9eff99 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -94,8 +94,9 @@ static void foreachObjectLink( walk(userData, ob, &wmd->map_object, IDWALK_CB_NOP); } -static void foreachIDLink(ModifierData *md, Object *ob, - IDWalkFunc walk, void *userData) +static void foreachIDLink( + ModifierData *md, Object *ob, + IDWalkFunc walk, void *userData) { WaveModifierData *wmd = (WaveModifierData *) md; @@ -104,8 +105,9 @@ static void foreachIDLink(ModifierData *md, Object *ob, foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData); } -static void foreachTexLink(ModifierData *md, Object *ob, - TexWalkFunc walk, void *userData) +static void foreachTexLink( + ModifierData *md, Object *ob, + TexWalkFunc walk, void *userData) { walk(userData, ob, md, "texture"); } @@ -138,10 +140,11 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) return dataMask; } -static void waveModifier_do(WaveModifierData *md, - Depsgraph *depsgraph, - Object *ob, DerivedMesh *dm, - float (*vertexCos)[3], int numVerts) +static void waveModifier_do( + WaveModifierData *md, + Depsgraph *depsgraph, + Object *ob, DerivedMesh *dm, + float (*vertexCos)[3], int numVerts) { WaveModifierData *wmd = (WaveModifierData *) md; MVert *mvert = NULL; @@ -292,10 +295,11 @@ static void waveModifier_do(WaveModifierData *md, if (wmd->texture) MEM_freeN(tex_co); } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *derivedData, - float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *derivedData, + float (*vertexCos)[3], + int numVerts) { DerivedMesh *dm = derivedData; WaveModifierData *wmd = (WaveModifierData *)md; diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c index c309bb8dbce..3d7c4bc24d8 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.c +++ b/source/blender/modifiers/intern/MOD_weightvg_util.c @@ -115,10 +115,11 @@ void weightvg_do_map(int num, float *new_w, short falloff_type, CurveMapping *cm * vertex index (in case the weight tables do not cover the whole vertices...). * XXX The standard "factor" value is assumed in [0.0, 1.0] range. Else, weird results might appear. */ -void weightvg_do_mask(const int num, const int *indices, float *org_w, const float *new_w, - Object *ob, Mesh *mesh, const float fact, const char defgrp_name[MAX_VGROUP_NAME], - Scene *scene, Tex *texture, const int tex_use_channel, const int tex_mapping, - Object *tex_map_object, const char *tex_uvlayer_name) +void weightvg_do_mask( + const int num, const int *indices, float *org_w, const float *new_w, + Object *ob, Mesh *mesh, const float fact, const char defgrp_name[MAX_VGROUP_NAME], + Scene *scene, Tex *texture, const int tex_use_channel, const int tex_mapping, + Object *tex_map_object, const char *tex_uvlayer_name) { int ref_didx; int i; @@ -238,9 +239,10 @@ void weightvg_do_mask(const int num, const int *indices, float *org_w, const flo * If indices is not NULL, it must be an array of same length as weights, mapping to the real * vertex index (in case the weight array does not cover the whole vertices...). */ -void weightvg_update_vg(MDeformVert *dvert, int defgrp_idx, MDeformWeight **dws, int num, - const int *indices, const float *weights, const bool do_add, - const float add_thresh, const bool do_rem, const float rem_thresh) +void weightvg_update_vg( + MDeformVert *dvert, int defgrp_idx, MDeformWeight **dws, int num, + const int *indices, const float *weights, const bool do_add, + const float add_thresh, const bool do_rem, const float rem_thresh) { int i; diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.h b/source/blender/modifiers/intern/MOD_weightvg_util.h index 73552e50d0f..341ea386e76 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.h +++ b/source/blender/modifiers/intern/MOD_weightvg_util.h @@ -72,17 +72,19 @@ void weightvg_do_map(int num, float *new_w, short mode, struct CurveMapping *cma * vertex index (in case the weight tables do not cover the whole vertices...). * XXX The standard "factor" value is assumed in [0.0, 1.0] range. Else, weird results might appear. */ -void weightvg_do_mask(const int num, const int *indices, float *org_w, const float *new_w, Object *ob, - struct Mesh *mesh, const float fact, const char defgrp_name[MAX_VGROUP_NAME], - struct Scene *scene, Tex *texture, const int tex_use_channel, const int tex_mapping, - Object *tex_map_object, const char *tex_uvlayer_name); +void weightvg_do_mask( + const int num, const int *indices, float *org_w, const float *new_w, Object *ob, + struct Mesh *mesh, const float fact, const char defgrp_name[MAX_VGROUP_NAME], + struct Scene *scene, Tex *texture, const int tex_use_channel, const int tex_mapping, + Object *tex_map_object, const char *tex_uvlayer_name); /* Applies weights to given vgroup (defgroup), and optionally add/remove vertices from the group. * If indices is not NULL, it must be a table of same length as weights, mapping to the real * vertex index (in case the weight table does not cover the whole vertices...). */ -void weightvg_update_vg(struct MDeformVert *dvert, int defgrp_idx, struct MDeformWeight **dws, int num, - const int *indices, const float *weights, const bool do_add, - const float add_thresh, const bool do_rem, const float rem_thresh); +void weightvg_update_vg( + struct MDeformVert *dvert, int defgrp_idx, struct MDeformWeight **dws, int num, + const int *indices, const float *weights, const bool do_add, + const float add_thresh, const bool do_rem, const float rem_thresh); #endif /* __MOD_WEIGHTVG_UTIL_H__ */ diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index 60ff36d7a68..068488ecf95 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -154,9 +154,10 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams)) return (wmd->defgrp_name[0] == '\0'); } -static Mesh *applyModifier(ModifierData *md, - const ModifierEvalContext *ctx, - Mesh *mesh) +static Mesh *applyModifier( + ModifierData *md, + const ModifierEvalContext *ctx, + Mesh *mesh) { BLI_assert(mesh != NULL); diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 94873af54ab..6b31ca677cc 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -139,9 +139,10 @@ static void vert2geom_task_cb_ex( /** * Find nearest vertex and/or edge and/or face, for each vertex (adapted from shrinkwrap.c). */ -static void get_vert2geom_distance(int numVerts, float (*v_cos)[3], - float *dist_v, float *dist_e, float *dist_f, - Mesh *target, const SpaceTransform *loc2trgt) +static void get_vert2geom_distance( + int numVerts, float (*v_cos)[3], + float *dist_v, float *dist_e, float *dist_f, + Mesh *target, const SpaceTransform *loc2trgt) { Vert2GeomData data = {0}; Vert2GeomDataChunk data_chunk = {{{0}}}; @@ -207,8 +208,9 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3], * Returns the real distance between a vertex and another reference object. * Note that it works in final world space (i.e. with constraints etc. applied). */ -static void get_vert2ob_distance(int numVerts, float (*v_cos)[3], float *dist, - Object *ob, Object *obr) +static void get_vert2ob_distance( + int numVerts, float (*v_cos)[3], float *dist, + Object *ob, Object *obr) { /* Vertex and ref object coordinates. */ float v_wco[3]; |