Cleanup: modifier arg wrapping

This commit is contained in:
2018-05-12 08:04:56 +02:00
parent f197134426
commit c84b8d4801
59 changed files with 584 additions and 444 deletions

View File

@@ -121,7 +121,8 @@ 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, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int numVerts,
@@ -180,7 +181,8 @@ static void deformMatricesEM(
if (!derivedData) dm->release(dm);
}
static void deformMatrices(ModifierData *md, Object *ob, DerivedMesh *derivedData,
static void deformMatrices(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
float (*vertexCos)[3], float (*defMats)[3][3], int numVerts)
{
ArmatureModifierData *amd = (ArmatureModifierData *) md;

View File

@@ -791,7 +791,8 @@ static DerivedMesh *arrayModifier_doArray(
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *dm,
ModifierApplyFlag flag)
{

View File

@@ -77,7 +77,8 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
/*
* This calls the new bevel code (added since 2.64)
*/
static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, struct Object *ob,
DerivedMesh *dm,
ModifierApplyFlag UNUSED(flag))
{

View File

@@ -66,7 +66,8 @@ static bool dependsOnTime(ModifierData *UNUSED(md))
return true;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
static DerivedMesh *applyModifier(
ModifierData *md, Object *UNUSED(ob),
DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{

View File

@@ -434,7 +434,8 @@ static void cuboid_do(
}
}
static void deformVerts(ModifierData *md, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int numVerts,

View File

@@ -72,7 +72,8 @@ static void initData(ModifierData *md)
cloth_init(clmd);
}
static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, float (*vertexCos)[3],
static void deformVerts(
ModifierData *md, Object *ob, DerivedMesh *derivedData, float (*vertexCos)[3],
int numVerts, ModifierApplyFlag UNUSED(flag))
{
DerivedMesh *dm;
@@ -219,7 +220,8 @@ static void freeData(ModifierData *md)
}
}
static void foreachIDLink(ModifierData *md, Object *ob,
static void foreachIDLink(
ModifierData *md, Object *ob,
IDWalkFunc walk, void *userData)
{
ClothModifierData *clmd = (ClothModifierData *) md;

View File

@@ -95,7 +95,8 @@ static bool dependsOnTime(ModifierData *UNUSED(md))
return true;
}
static void deformVerts(ModifierData *md, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int UNUSED(numVerts),

View File

@@ -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;
}

View File

@@ -114,7 +114,8 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Curve Modifier");
}
static void deformVerts(ModifierData *md, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int numVerts,

View File

@@ -163,7 +163,8 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
DT_TYPE_SHARP_FACE \
)
static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *derivedData,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{
DataTransferModifierData *dtmd = (DataTransferModifierData *) md;

View File

@@ -77,7 +77,8 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
return dataMask;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{

View File

@@ -107,7 +107,8 @@ static bool dependsOnNormals(ModifierData *md)
return ELEM(dmd->direction, MOD_DISP_DIR_NOR, MOD_DISP_DIR_CLNOR);
}
static void foreachObjectLink(ModifierData *md, Object *ob,
static void foreachObjectLink(
ModifierData *md, Object *ob,
ObjectWalkFunc walk, void *userData)
{
DisplaceModifierData *dmd = (DisplaceModifierData *) md;
@@ -115,7 +116,8 @@ static void foreachObjectLink(ModifierData *md, Object *ob,
walk(userData, ob, &dmd->map_object, IDWALK_CB_NOP);
}
static void foreachIDLink(ModifierData *md, Object *ob,
static void foreachIDLink(
ModifierData *md, Object *ob,
IDWalkFunc walk, void *userData)
{
DisplaceModifierData *dmd = (DisplaceModifierData *) md;
@@ -125,7 +127,8 @@ static void foreachIDLink(ModifierData *md, Object *ob,
foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
}
static void foreachTexLink(ModifierData *md, Object *ob,
static void foreachTexLink(
ModifierData *md, Object *ob,
TexWalkFunc walk, void *userData)
{
walk(userData, ob, md, "texture");
@@ -380,7 +383,8 @@ static void displaceModifier_do(
}
}
static void deformVerts(ModifierData *md, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int numVerts,

View File

@@ -103,7 +103,8 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
return dataMask;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *dm,
ModifierApplyFlag flag)
{
@@ -163,7 +164,8 @@ static bool dependsOnTime(ModifierData *UNUSED(md))
return true;
}
static void foreachIDLink(ModifierData *md, Object *ob,
static void foreachIDLink(
ModifierData *md, Object *ob,
IDWalkFunc walk, void *userData)
{
DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md;
@@ -184,7 +186,8 @@ static void foreachIDLink(ModifierData *md, Object *ob,
}
}
static void foreachTexLink(ModifierData *UNUSED(md), Object *UNUSED(ob),
static void foreachTexLink(
ModifierData *UNUSED(md), Object *UNUSED(ob),
TexWalkFunc UNUSED(walk), void *UNUSED(userData))
{
//walk(userData, ob, md, ""); /* re-enable when possible */

View File

@@ -112,7 +112,8 @@ static void initData(ModifierData *md)
emd->flags = MOD_EDGESPLIT_FROMANGLE | MOD_EDGESPLIT_FROMFLAG;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), DerivedMesh *dm,
static DerivedMesh *applyModifier(
ModifierData *md, Object *UNUSED(ob), DerivedMesh *dm,
ModifierApplyFlag UNUSED(flag))
{
DerivedMesh *result;

View File

@@ -94,7 +94,8 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
return dataMask;
}
static void createFacepa(ExplodeModifierData *emd,
static void createFacepa(
ExplodeModifierData *emd,
ParticleSystemModifierData *psmd,
DerivedMesh *dm)
{
@@ -785,7 +786,8 @@ static DerivedMesh *cutEdges(ExplodeModifierData *emd, DerivedMesh *dm)
return splitdm;
}
static DerivedMesh *explodeMesh(ExplodeModifierData *emd,
static DerivedMesh *explodeMesh(
ExplodeModifierData *emd,
ParticleSystemModifierData *psmd, Scene *scene, Object *ob,
DerivedMesh *to_explode)
{
@@ -993,7 +995,8 @@ static ParticleSystemModifierData *findPrecedingParticlesystem(Object *ob, Modif
}
return psmd;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{

View File

@@ -85,7 +85,8 @@ static void copyData(const ModifierData *md, ModifierData *target)
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *dm,
ModifierApplyFlag flag)
{

View File

@@ -304,7 +304,8 @@ static DerivedMesh *fluidsim_read_obj(const char *filename, const MPoly *mp_exam
}
void fluid_get_bb(MVert *mvert, int totvert, float obmat[4][4],
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;
@@ -425,7 +426,8 @@ static void fluidsim_read_vel_cache(FluidsimModifierData *fluidmd, DerivedMesh *
gzclose(gzf);
}
static DerivedMesh *fluidsim_read_cache(Object *ob, DerivedMesh *orgdm,
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 */
@@ -509,7 +511,8 @@ static DerivedMesh *fluidsim_read_cache(Object *ob, DerivedMesh *orgdm,
}
#endif // WITH_MOD_FLUID
DerivedMesh *fluidsimModifier_do(FluidsimModifierData *fluidmd, Scene *scene,
DerivedMesh *fluidsimModifier_do(
FluidsimModifierData *fluidmd, Scene *scene,
Object *ob,
DerivedMesh *dm,
int useRenderParams, int UNUSED(isFinalCalc))

View File

@@ -42,7 +42,8 @@ struct DerivedMesh;
void fluidsim_init(struct FluidsimModifierData *fluidmd);
void fluidsim_free(struct FluidsimModifierData *fluidmd);
struct DerivedMesh *fluidsimModifier_do(struct FluidsimModifierData *fluidmd,
struct DerivedMesh *fluidsimModifier_do(
struct FluidsimModifierData *fluidmd,
struct Scene *scene, struct Object *ob, struct DerivedMesh *dm,
int useRenderParams, int isFinalCalc);

View File

@@ -264,7 +264,8 @@ static void hook_co_apply(struct HookData_cb *hd, const int j)
}
}
static void deformVerts_do(HookModifierData *hmd, Object *ob, DerivedMesh *dm,
static void deformVerts_do(
HookModifierData *hmd, Object *ob, DerivedMesh *dm,
float (*vertexCos)[3], int numVerts)
{
bPoseChannel *pchan = BKE_pose_channel_find_name(hmd->object->pose, hmd->subtarget);
@@ -361,7 +362,8 @@ static void deformVerts_do(HookModifierData *hmd, Object *ob, DerivedMesh *dm,
}
}
static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
static void deformVerts(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
float (*vertexCos)[3], int numVerts,
ModifierApplyFlag UNUSED(flag))
{
@@ -377,7 +379,8 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
dm->release(dm);
}
static void deformVertsEM(ModifierData *md, Object *ob, struct BMEditMesh *editData,
static void deformVertsEM(
ModifierData *md, Object *ob, struct BMEditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{
HookModifierData *hmd = (HookModifierData *) md;

View File

@@ -509,7 +509,8 @@ static bool isValidVertexGroup(LaplacianDeformModifierData *lmd, Object *ob, Der
return (dvert != NULL);
}
static void initSystem(LaplacianDeformModifierData *lmd, Object *ob, DerivedMesh *dm,
static void initSystem(
LaplacianDeformModifierData *lmd, Object *ob, DerivedMesh *dm,
float (*vertexCos)[3], int numVerts)
{
int i;
@@ -724,7 +725,8 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
return dataMask;
}
static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
static void deformVerts(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
float (*vertexCos)[3], int numVerts, ModifierApplyFlag UNUSED(flag))
{
DerivedMesh *dm = get_dm(ob, NULL, derivedData, NULL, false, false);

View File

@@ -495,7 +495,8 @@ static CustomDataMask required_data_mask(Object *UNUSED(ob), ModifierData *md)
return dataMask;
}
static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
static void deformVerts(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
float (*vertexCos)[3], int numVerts, ModifierApplyFlag UNUSED(flag))
{
DerivedMesh *dm;

View File

@@ -103,7 +103,8 @@ 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, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int numVerts,

View File

@@ -96,7 +96,8 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
}
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *dm,
ModifierApplyFlag UNUSED(flag))
{

View File

@@ -263,7 +263,8 @@ static void meshcache_do(
}
}
static void deformVerts(ModifierData *md, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int numVerts,

View File

@@ -48,7 +48,8 @@ typedef struct MDDHead {
int verts_tot;
} MDDHead; /* frames, verts */
static bool meshcache_read_mdd_head(FILE *fp, const int verts_tot,
static bool meshcache_read_mdd_head(
FILE *fp, const int verts_tot,
MDDHead *mdd_head,
const char **err_str)
{
@@ -78,7 +79,8 @@ 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,
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,
@@ -97,7 +99,8 @@ static bool meshcache_read_mdd_range(FILE *fp,
return true;
}
static bool meshcache_read_mdd_range_from_time(FILE *fp,
static bool meshcache_read_mdd_range_from_time(
FILE *fp,
const int verts_tot,
const float time, const float UNUSED(fps),
float *r_frame,
@@ -144,7 +147,8 @@ static bool meshcache_read_mdd_range_from_time(FILE *fp,
return true;
}
bool MOD_meshcache_read_mdd_index(FILE *fp,
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)
@@ -212,7 +216,8 @@ bool MOD_meshcache_read_mdd_index(FILE *fp,
return true;
}
bool MOD_meshcache_read_mdd_frame(FILE *fp,
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)
@@ -253,7 +258,8 @@ bool MOD_meshcache_read_mdd_frame(FILE *fp,
}
}
bool MOD_meshcache_read_mdd_times(const char *filepath,
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)

View File

@@ -52,7 +52,8 @@ typedef struct PC2Head {
int frame_tot;
} PC2Head; /* frames, verts */
static bool meshcache_read_pc2_head(FILE *fp, const int verts_tot,
static bool meshcache_read_pc2_head(
FILE *fp, const int verts_tot,
PC2Head *pc2_head,
const char **err_str)
{
@@ -90,7 +91,8 @@ 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,
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,
@@ -109,7 +111,8 @@ static bool meshcache_read_pc2_range(FILE *fp,
return true;
}
static bool meshcache_read_pc2_range_from_time(FILE *fp,
static bool meshcache_read_pc2_range_from_time(
FILE *fp,
const int verts_tot,
const float time, const float fps,
float *r_frame,
@@ -135,7 +138,8 @@ static bool meshcache_read_pc2_range_from_time(FILE *fp,
return true;
}
bool MOD_meshcache_read_pc2_index(FILE *fp,
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)
@@ -188,7 +192,8 @@ bool MOD_meshcache_read_pc2_index(FILE *fp,
}
bool MOD_meshcache_read_pc2_frame(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)
@@ -229,7 +234,8 @@ bool MOD_meshcache_read_pc2_frame(FILE *fp,
}
}
bool MOD_meshcache_read_pc2_times(const char *filepath,
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)

View File

@@ -31,7 +31,8 @@
#include "MOD_meshcache_util.h"
void MOD_meshcache_calc_range(const float frame, const char interp,
void MOD_meshcache_calc_range(
const float frame, const char interp,
const int frame_tot,
int r_index_range[2], float *r_factor)
{

View File

@@ -29,35 +29,42 @@
/* MOD_meshcache_mdd.c */
bool MOD_meshcache_read_mdd_index(FILE *fp,
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,
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,
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,
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,
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,
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,
void MOD_meshcache_calc_range(
const float frame, const char interp,
const int frame_tot,
int r_index_range[2], float *r_factor);

View File

@@ -422,7 +422,8 @@ static void meshdeformModifier_do(
cagedm->release(cagedm);
}
static void deformVerts(ModifierData *md, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int numVerts,
@@ -438,7 +439,8 @@ static void deformVerts(ModifierData *md, Object *ob,
dm->release(dm);
}
static void deformVertsEM(ModifierData *md, Object *ob,
static void deformVertsEM(
ModifierData *md, Object *ob,
struct BMEditMesh *UNUSED(editData),
DerivedMesh *derivedData,
float (*vertexCos)[3],

View File

@@ -88,7 +88,8 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
return (mcmd->cache_file == NULL) || (mcmd->object_path[0] == '\0');
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *dm,
ModifierApplyFlag UNUSED(flag))
{
@@ -158,7 +159,8 @@ static bool dependsOnTime(ModifierData *md)
return true;
}
static void foreachIDLink(ModifierData *md, Object *ob,
static void foreachIDLink(
ModifierData *md, Object *ob,
IDWalkFunc walk, void *userData)
{
MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md;

View File

@@ -88,7 +88,8 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Mirror Modifier");
}
static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
static DerivedMesh *doMirrorOnAxis(
MirrorModifierData *mmd,
Object *ob,
DerivedMesh *dm,
int axis)
@@ -299,7 +300,8 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
return result;
}
static DerivedMesh *mirrorModifier__doMirror(MirrorModifierData *mmd,
static DerivedMesh *mirrorModifier__doMirror(
MirrorModifierData *mmd,
Object *ob, DerivedMesh *dm)
{
DerivedMesh *result = dm;
@@ -322,7 +324,8 @@ static DerivedMesh *mirrorModifier__doMirror(MirrorModifierData *mmd,
return result;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{

View File

@@ -58,7 +58,8 @@ static void initData(ModifierData *md)
mmd->totlvl = 0;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *dm,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob, DerivedMesh *dm,
ModifierApplyFlag flag)
{
MultiresModifierData *mmd = (MultiresModifierData *)md;

View File

@@ -404,7 +404,8 @@ static DerivedMesh *generate_ocean_geometry(OceanModifierData *omd)
return result;
}
static DerivedMesh *doOcean(ModifierData *md, Object *ob,
static DerivedMesh *doOcean(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
int UNUSED(useRenderParams))
{
@@ -544,7 +545,8 @@ static DerivedMesh *doOcean(ModifierData *md, Object *ob,
return dm;
}
#else /* WITH_OCEANSIM */
static DerivedMesh *doOcean(ModifierData *md, Object *UNUSED(ob),
static DerivedMesh *doOcean(
ModifierData *md, Object *UNUSED(ob),
DerivedMesh *derivedData,
int UNUSED(useRenderParams))
{
@@ -554,7 +556,8 @@ static DerivedMesh *doOcean(ModifierData *md, Object *UNUSED(ob),
}
#endif /* WITH_OCEANSIM */
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{

View File

@@ -146,7 +146,8 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
}
}
static void foreachObjectLink(ModifierData *md, Object *ob,
static void foreachObjectLink(
ModifierData *md, Object *ob,
ObjectWalkFunc walk, void *userData)
{
ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *) md;
@@ -209,7 +210,8 @@ static void store_float_in_vcol(MLoopCol *vcol, float float_value)
vcol->a = 1.0f;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{

View File

@@ -99,7 +99,8 @@ 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, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int UNUSED(numVerts),

View File

@@ -133,7 +133,8 @@ static void dualcon_add_quad(void *output_v, const int vert_indices[4])
output->curface++;
}
static DerivedMesh *applyModifier(ModifierData *md,
static DerivedMesh *applyModifier(
ModifierData *md,
Object *UNUSED(ob),
DerivedMesh *dm,
ModifierApplyFlag UNUSED(flag))
@@ -194,7 +195,8 @@ static DerivedMesh *applyModifier(ModifierData *md,
#else /* !WITH_MOD_REMESH */
static DerivedMesh *applyModifier(ModifierData *UNUSED(md), Object *UNUSED(ob),
static DerivedMesh *applyModifier(
ModifierData *UNUSED(md), Object *UNUSED(ob),
DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{

View File

@@ -176,7 +176,8 @@ static void initData(ModifierData *md)
ltmd->merge_dist = 0.01f;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
ModifierApplyFlag flag)
{

View File

@@ -44,7 +44,8 @@
#include "MOD_modifiertypes.h"
static void deformVerts(ModifierData *UNUSED(md), Object *ob,
static void deformVerts(
ModifierData *UNUSED(md), Object *ob,
DerivedMesh *UNUSED(derivedData),
float (*vertexCos)[3],
int numVerts,
@@ -61,7 +62,8 @@ static void deformVerts(ModifierData *UNUSED(md), Object *ob,
}
}
static void deformMatrices(ModifierData *md, Object *ob, DerivedMesh *derivedData,
static void deformMatrices(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
float (*vertexCos)[3], float (*defMats)[3][3], int numVerts)
{
Key *key = BKE_key_from_object(ob);
@@ -83,7 +85,8 @@ static void deformMatrices(ModifierData *md, Object *ob, DerivedMesh *derivedDat
deformVerts(md, ob, derivedData, vertexCos, numVerts, 0);
}
static void deformVertsEM(ModifierData *md, Object *ob,
static void deformVertsEM(
ModifierData *md, Object *ob,
struct BMEditMesh *UNUSED(editData),
DerivedMesh *derivedData,
float (*vertexCos)[3],
@@ -95,7 +98,8 @@ static void deformVertsEM(ModifierData *md, Object *ob,
deformVerts(md, ob, derivedData, vertexCos, numVerts, 0);
}
static void deformMatricesEM(ModifierData *UNUSED(md), Object *ob,
static void deformMatricesEM(
ModifierData *UNUSED(md), Object *ob,
struct BMEditMesh *UNUSED(editData),
DerivedMesh *UNUSED(derivedData),
float (*vertexCos)[3],

View File

@@ -96,7 +96,8 @@ static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk,
walk(userData, ob, &smd->auxTarget, IDWALK_CB_NOP);
}
static void deformVerts(ModifierData *md, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int numVerts,
@@ -117,7 +118,8 @@ static void deformVerts(ModifierData *md, Object *ob,
dm->release(dm);
}
static void deformVertsEM(ModifierData *md, Object *ob, struct BMEditMesh *editData, DerivedMesh *derivedData,
static void deformVertsEM(
ModifierData *md, Object *ob, struct BMEditMesh *editData, DerivedMesh *derivedData,
float (*vertexCos)[3], int numVerts)
{
DerivedMesh *dm = derivedData;

View File

@@ -183,7 +183,8 @@ 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 DerivedMesh *dm,
static void SimpleDeformModifier_do(
SimpleDeformModifierData *smd, struct Object *ob, struct DerivedMesh *dm,
float (*vertexCos)[3], int numVerts)
{
const float base_limit[2] = {0.0f, 0.0f};
@@ -385,7 +386,8 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
}
}
static void deformVerts(ModifierData *md, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int numVerts,
@@ -405,7 +407,8 @@ static void deformVerts(ModifierData *md, Object *ob,
dm->release(dm);
}
static void deformVertsEM(ModifierData *md, Object *ob,
static void deformVertsEM(
ModifierData *md, Object *ob,
struct BMEditMesh *editData,
DerivedMesh *derivedData,
float (*vertexCos)[3],

View File

@@ -134,7 +134,8 @@ typedef struct {
int mat_nr;
} SkinOutput;
static void add_poly(SkinOutput *so,
static void add_poly(
SkinOutput *so,
BMVert *v1,
BMVert *v2,
BMVert *v3,
@@ -142,7 +143,8 @@ static void add_poly(SkinOutput *so,
/***************************** Convex Hull ****************************/
static bool is_quad_symmetric(BMVert *quad[4],
static bool is_quad_symmetric(
BMVert *quad[4],
const SkinModifierData *smd)
{
const float threshold = 0.0001f;
@@ -175,7 +177,8 @@ 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],
static bool quad_crosses_symmetry_plane(
BMVert *quad[4],
const SkinModifierData *smd)
{
int axis;
@@ -202,7 +205,8 @@ 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,
static bool skin_frame_find_contained_faces(
const Frame *frame,
BMFace *fill_faces[2])
{
BMEdge *diag;
@@ -410,7 +414,8 @@ static void merge_frame_corners(Frame **frames, int totframe)
}
}
static Frame **collect_hull_frames(int v, SkinNode *frames,
static Frame **collect_hull_frames(
int v, SkinNode *frames,
const MeshElemMap *emap, const MEdge *medge,
int *tothullframe)
{
@@ -450,7 +455,8 @@ static void node_frames_init(SkinNode *nf, int totframe)
nf->seam_edges[i] = -1;
}
static void create_frame(Frame *frame, const float co[3],
static void create_frame(
Frame *frame, const float co[3],
const float radius[2],
float mat[3][3], float offset)
{
@@ -482,7 +488,8 @@ 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,
static void end_node_frames(
int v, SkinNode *skin_nodes, const MVert *mvert,
const MVertSkin *nodes, const MeshElemMap *emap,
EMat *emat)
{
@@ -555,7 +562,8 @@ 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,
static void connection_node_frames(
int v, SkinNode *skin_nodes, const MVert *mvert,
const MVertSkin *nodes, const MeshElemMap *emap,
EMat *emat)
{
@@ -593,7 +601,8 @@ 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,
static SkinNode *build_frames(
const MVert *mvert, int totvert,
const MVertSkin *nodes, const MeshElemMap *emap,
EMat *emat)
{
@@ -652,7 +661,8 @@ typedef struct {
int e;
} EdgeStackElem;
static void build_emats_stack(BLI_Stack *stack, BLI_bitmap *visited_e, EMat *emat,
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)
{
@@ -705,7 +715,8 @@ static void build_emats_stack(BLI_Stack *stack, BLI_bitmap *visited_e, EMat *ema
}
}
static EMat *build_edge_mats(const MVertSkin *vs,
static EMat *build_edge_mats(
const MVertSkin *vs,
const MVert *mvert,
int totvert,
const MEdge *medge,
@@ -763,7 +774,8 @@ 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,
static int calc_edge_subdivisions(
const MVert *mvert, const MVertSkin *nodes,
const MEdge *e, const int *degree)
{
/* prevent memory errors [#38003] */
@@ -955,7 +967,8 @@ static DerivedMesh *subdivide_base(DerivedMesh *orig)
/******************************* Output *******************************/
/* Can be either quad or triangle */
static void add_poly(SkinOutput *so,
static void add_poly(
SkinOutput *so,
BMVert *v1,
BMVert *v2,
BMVert *v3,
@@ -1030,7 +1043,8 @@ static void connect_frames(
}
}
static void output_frames(BMesh *bm,
static void output_frames(
BMesh *bm,
SkinNode *sn,
const MDeformVert *input_dvert)
{

View File

@@ -101,7 +101,8 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
return dataMask;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *dm,
ModifierApplyFlag flag)
{
@@ -159,7 +160,8 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
}
}
static void foreachIDLink(ModifierData *md, Object *ob,
static void foreachIDLink(
ModifierData *md, Object *ob,
IDWalkFunc walk, void *userData)
{
SmokeModifierData *smd = (SmokeModifierData *) md;

View File

@@ -206,7 +206,8 @@ static void smoothModifier_do(
MEM_freeN(uctmp);
}
static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
static void deformVerts(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
float (*vertexCos)[3], int numVerts, ModifierApplyFlag UNUSED(flag))
{
DerivedMesh *dm = get_dm(ob, NULL, derivedData, NULL, false, false);

View File

@@ -48,7 +48,8 @@
#include "MOD_modifiertypes.h"
static void deformVerts(ModifierData *md, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *UNUSED(derivedData),
float (*vertexCos)[3],
int numVerts,

View File

@@ -97,7 +97,8 @@ static bool isDisabled(ModifierData *md, int useRenderParams)
return get_render_subsurf_level(&md->scene->r, levels, useRenderParams != 0) == 0;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
ModifierApplyFlag flag)
{
@@ -156,7 +157,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
return result;
}
static DerivedMesh *applyModifierEM(ModifierData *md, Object *UNUSED(ob),
static DerivedMesh *applyModifierEM(
ModifierData *md, Object *UNUSED(ob),
struct BMEditMesh *UNUSED(editData),
DerivedMesh *derivedData,
ModifierApplyFlag flag)

View File

@@ -82,7 +82,8 @@ static bool dependsOnTime(ModifierData *UNUSED(md))
return true;
}
static void deformVerts(ModifierData *md, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int UNUSED(numVerts),

View File

@@ -195,7 +195,8 @@ 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,
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;
@@ -915,7 +916,8 @@ static void bindVert(
freeBindData(bwdata);
}
static bool surfacedeformBind(SurfaceDeformModifierData *smd, float (*vertexCos)[3],
static bool surfacedeformBind(
SurfaceDeformModifierData *smd, float (*vertexCos)[3],
unsigned int numverts, unsigned int tnumpoly, unsigned int tnumverts, DerivedMesh *tdm)
{
BVHTreeFromMesh treeData = {NULL};
@@ -1186,7 +1188,8 @@ static void surfacedeformModifier_do(ModifierData *md, float (*vertexCos)[3], un
}
}
static void deformVerts(ModifierData *md, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *UNUSED(derivedData),
float (*vertexCos)[3], int numVerts,
ModifierApplyFlag UNUSED(flag))
@@ -1194,7 +1197,8 @@ static void deformVerts(ModifierData *md, Object *ob,
surfacedeformModifier_do(md, vertexCos, numVerts, ob);
}
static void deformVertsEM(ModifierData *md, Object *ob,
static void deformVertsEM(
ModifierData *md, Object *ob,
struct BMEditMesh *UNUSED(editData),
DerivedMesh *UNUSED(derivedData),
float (*vertexCos)[3], int numVerts)

View File

@@ -74,7 +74,8 @@ static void initData(ModifierData *md)
tmd->ngon_method = MOD_TRIANGULATE_NGON_BEAUTY;
}
static DerivedMesh *applyModifier(ModifierData *md,
static DerivedMesh *applyModifier(
ModifierData *md,
Object *UNUSED(ob),
DerivedMesh *dm,
ModifierApplyFlag UNUSED(flag))

View File

@@ -65,7 +65,8 @@ void modifier_init_texture(const Scene *scene, Tex *tex)
}
}
void get_texture_coords(MappingInfoModifierData *dmd, Object *ob,
void get_texture_coords(
MappingInfoModifierData *dmd, Object *ob,
DerivedMesh *dm,
float (*co)[3], float (*texco)[3],
int numVerts)
@@ -170,7 +171,8 @@ 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,
DerivedMesh *get_dm(
Object *ob, struct BMEditMesh *em, DerivedMesh *dm,
float (*vertexCos)[3], bool use_normals, bool use_orco)
{
if (dm) {

View File

@@ -41,15 +41,19 @@ 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,
void get_texture_coords(
struct MappingInfoModifierData *dmd, struct Object *ob, struct DerivedMesh *dm,
float (*co)[3], float (*texco)[3], int numVerts);
void modifier_vgroup_cache(struct ModifierData *md, float (*vertexCos)[3]);
struct DerivedMesh *get_cddm(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm,
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,
struct DerivedMesh *get_dm(
struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm,
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,
void modifier_get_vgroup(
struct Object *ob, struct DerivedMesh *dm,
const char *name, struct MDeformVert **dvert, int *defgrp_index);
#endif /* __MOD_UTIL_H__ */

View File

@@ -77,7 +77,8 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(
return dataMask;
}
static void foreachObjectLink(ModifierData *md, Object *ob,
static void foreachObjectLink(
ModifierData *md, Object *ob,
ObjectWalkFunc walk, void *userData)
{
UVProjectModifierData *umd = (UVProjectModifierData *) md;
@@ -87,7 +88,8 @@ static void foreachObjectLink(ModifierData *md, Object *ob,
walk(userData, ob, &umd->projectors[i], IDWALK_CB_NOP);
}
static void foreachIDLink(ModifierData *md, Object *ob,
static void foreachIDLink(
ModifierData *md, Object *ob,
IDWalkFunc walk, void *userData)
{
UVProjectModifierData *umd = (UVProjectModifierData *) md;
@@ -130,7 +132,8 @@ typedef struct Projector {
void *uci; /* optional uv-project info (panorama projection) */
} Projector;
static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
static DerivedMesh *uvprojectModifier_do(
UVProjectModifierData *umd,
Object *ob, DerivedMesh *dm)
{
float (*coords)[3], (*co)[3];
@@ -335,7 +338,8 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
return dm;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{

View File

@@ -45,7 +45,8 @@
#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],
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};
@@ -139,7 +140,8 @@ static void uv_warp_compute(
}
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob,
DerivedMesh *dm,
ModifierApplyFlag UNUSED(flag))
{
@@ -225,7 +227,8 @@ 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(DagForest *forest, DagNode *obNode,
static void uv_warp_deps_object_bone(
DagForest *forest, DagNode *obNode,
Object *obj, const char *bonename)
{
if (obj) {
@@ -246,7 +249,8 @@ static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContex
uv_warp_deps_object_bone(ctx->forest, ctx->obNode, umd->object_dst, umd->bone_dst);
}
static void uv_warp_deps_object_bone_new(struct DepsNodeHandle *node,
static void uv_warp_deps_object_bone_new(
struct DepsNodeHandle *node,
Object *object,
const char *bonename)
{

View File

@@ -165,7 +165,8 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
}
}
static void warpModifier_do(WarpModifierData *wmd, Object *ob,
static void warpModifier_do(
WarpModifierData *wmd, Object *ob,
DerivedMesh *dm, float (*vertexCos)[3], int numVerts)
{
float obinv[4][4];
@@ -325,7 +326,8 @@ static int warp_needs_dm(WarpModifierData *wmd)
return wmd->texture || wmd->defgrp_name[0];
}
static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
static void deformVerts(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
float (*vertexCos)[3], int numVerts, ModifierApplyFlag UNUSED(flag))
{
DerivedMesh *dm = NULL;
@@ -342,7 +344,8 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
}
}
static void deformVertsEM(ModifierData *md, Object *ob, struct BMEditMesh *em,
static void deformVertsEM(
ModifierData *md, Object *ob, struct BMEditMesh *em,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{
DerivedMesh *dm = derivedData;

View File

@@ -93,7 +93,8 @@ static void foreachObjectLink(
walk(userData, ob, &wmd->map_object, IDWALK_CB_NOP);
}
static void foreachIDLink(ModifierData *md, Object *ob,
static void foreachIDLink(
ModifierData *md, Object *ob,
IDWalkFunc walk, void *userData)
{
WaveModifierData *wmd = (WaveModifierData *) md;
@@ -103,7 +104,8 @@ static void foreachIDLink(ModifierData *md, Object *ob,
foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
}
static void foreachTexLink(ModifierData *md, Object *ob,
static void foreachTexLink(
ModifierData *md, Object *ob,
TexWalkFunc walk, void *userData)
{
walk(userData, ob, md, "texture");
@@ -156,7 +158,8 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
return dataMask;
}
static void waveModifier_do(WaveModifierData *md,
static void waveModifier_do(
WaveModifierData *md,
Scene *scene, Object *ob, DerivedMesh *dm,
float (*vertexCos)[3], int numVerts)
{
@@ -309,7 +312,8 @@ static void waveModifier_do(WaveModifierData *md,
if (wmd->texture) MEM_freeN(tex_co);
}
static void deformVerts(ModifierData *md, Object *ob,
static void deformVerts(
ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int numVerts,

View File

@@ -114,7 +114,8 @@ 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(int num, const int *indices, float *org_w, const float *new_w,
void weightvg_do_mask(
int num, const int *indices, float *org_w, const float *new_w,
Object *ob, DerivedMesh *dm, float fact, const char defgrp_name[MAX_VGROUP_NAME],
Scene *scene, Tex *texture, int tex_use_channel, int tex_mapping,
Object *tex_map_object, const char *tex_uvlayer_name)
@@ -238,7 +239,8 @@ void weightvg_do_mask(int num, const int *indices, float *org_w, const float *ne
* 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,
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)
{

View File

@@ -70,7 +70,8 @@ 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(int num, const int *indices, float *org_w, const float *new_w, Object *ob,
void weightvg_do_mask(
int num, const int *indices, float *org_w, const float *new_w, Object *ob,
DerivedMesh *dm, float fact, const char defgrp_name[MAX_VGROUP_NAME],
struct Scene *scene, Tex *texture, int tex_use_channel, int tex_mapping,
Object *tex_map_object, const char *tex_uvlayer_name);
@@ -79,7 +80,8 @@ void weightvg_do_mask(int num, const int *indices, float *org_w, const float *ne
* 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(MDeformVert *dvert, int defgrp_idx, MDeformWeight **dws, int num,
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);

View File

@@ -172,7 +172,8 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
return (wmd->defgrp_name[0] == '\0');
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *derivedData,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{
WeightVGEditModifierData *wmd = (WeightVGEditModifierData *) md;

View File

@@ -209,7 +209,8 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
return (wmd->defgrp_name_a[0] == '\0');
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *derivedData,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{
WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md;

View File

@@ -136,7 +136,8 @@ 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],
static void get_vert2geom_distance(
int numVerts, float (*v_cos)[3],
float *dist_v, float *dist_e, float *dist_f,
DerivedMesh *target, const SpaceTransform *loc2trgt)
{
@@ -204,7 +205,8 @@ 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,
static void get_vert2ob_distance(
int numVerts, float (*v_cos)[3], float *dist,
Object *ob, Object *obr)
{
/* Vertex and ref object coordinates. */
@@ -382,7 +384,8 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
return (wmd->proximity_ob_target == NULL);
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *derivedData,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{
WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *) md;