sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

remove unused args for some modifiers, no functional change.

Browse Source
This commit is contained in:
Campbell Barton 2010-10-21 01:10:22 +00:00
parent 16b04834b3
commit fec8292df1
10 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_cloth.h
View File

@ -222,7 +222,7 @@ void clmdSetInterruptCallBack ( int ( *f ) ( void ) );
void cloth_free_modifier_extern ( struct ClothModifierData *clmd );
void cloth_free_modifier ( struct ClothModifierData *clmd );
void cloth_init ( struct ClothModifierData *clmd );
struct DerivedMesh *clothModifier_do ( struct ClothModifierData *clmd, struct Scene *scene, struct Object *ob, struct DerivedMesh *dm, int useRenderParams, int isFinalCalc );
struct DerivedMesh *clothModifier_do ( struct ClothModifierData *clmd, struct Scene *scene, struct Object *ob, struct DerivedMesh *dm);
void cloth_update_normals ( ClothVertex *verts, int nVerts, struct MFace *face, int totface );
int cloth_uses_vgroup(struct ClothModifierData *clmd);

2
source/blender/blenkernel/BKE_smoke.h
View File

@ -34,7 +34,7 @@
typedef float (*bresenham_callback) (float *result, float *input, int res[3], int *pixel, float *tRay, float correct);
void smokeModifier_do(struct SmokeModifierData *smd, struct Scene *scene, struct Object *ob, struct DerivedMesh *dm, int useRenderParams, int isFinalCalc);
void smokeModifier_do(struct SmokeModifierData *smd, struct Scene *scene, struct Object *ob, struct DerivedMesh *dm);
void smokeModifier_free (struct SmokeModifierData *smd);
void smokeModifier_reset(struct SmokeModifierData *smd);

2
source/blender/blenkernel/intern/cloth.c
View File

@ -423,7 +423,7 @@ static int do_step_cloth(Object *ob, ClothModifierData *clmd, DerivedMesh *resul
/************************************************
* clothModifier_do - main simulation function
************************************************/
DerivedMesh *clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob, DerivedMesh *dm, int UNUSED(useRenderParams), int UNUSED(isFinalCalc))
DerivedMesh *clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob, DerivedMesh *dm)
{
DerivedMesh *result;
PointCache *cache;

2
source/blender/blenkernel/intern/particle_system.c
View File

@ -3260,7 +3260,7 @@ static void do_hair_dynamics(ParticleSimulationData *sim)
psys->clmd->point_cache = psys->pointcache;
psys->clmd->sim_parms->effector_weights = psys->part->effector_weights;
psys->hair_out_dm = clothModifier_do(psys->clmd, sim->scene, sim->ob, dm, 0, 0);
psys->hair_out_dm = clothModifier_do(psys->clmd, sim->scene, sim->ob, dm);
psys->clmd->sim_parms->effector_weights = NULL;
}

2
source/blender/blenkernel/intern/smoke.c
View File

@ -1270,7 +1270,7 @@ static void smoke_calc_domain(Scene *scene, Object *ob, SmokeModifierData *smd)
}
}
}
void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedMesh *dm, int UNUSED(useRenderParams), int UNUSED(isFinalCalc))
void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedMesh *dm)
{
if((smd->type & MOD_SMOKE_TYPE_FLOW))
{

19
source/blender/modifiers/intern/MOD_array.c
View File

@ -729,26 +729,27 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
return result;
}
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
int UNUSED(useRenderParams), int UNUSED(isFinalCalc))
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
DerivedMesh *dm,
int UNUSED(useRenderParams),
int UNUSED(isFinalCalc))
{
DerivedMesh *result;
ArrayModifierData *amd = (ArrayModifierData*) md;
result = arrayModifier_doArray(amd, md->scene, ob, derivedData, 0);
result = arrayModifier_doArray(amd, md->scene, ob, dm, 0);
if(result != derivedData)
if(result != dm)
CDDM_calc_normals(result);
return result;
}
static DerivedMesh *applyModifierEM(
ModifierData *md, Object *ob, struct EditMesh *UNUSED(editData),
DerivedMesh *derivedData)
static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
struct EditMesh *UNUSED(editData),
DerivedMesh *dm)
{
return applyModifier(md, ob, derivedData, 0, 1);
return applyModifier(md, ob, dm, 0, 1);
}

10
source/blender/modifiers/intern/MOD_cloth.c
View File

@ -62,7 +62,9 @@ static void initData(ModifierData *md)
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
DerivedMesh *derivedData, int useRenderParams, int isFinalCalc)
DerivedMesh *dm,
int UNUSED(useRenderParams),
int UNUSED(isFinalCalc))
{
ClothModifierData *clmd = (ClothModifierData*) md;
DerivedMesh *result=NULL;
@ -73,17 +75,17 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
initData(md);
if(!clmd->sim_parms || !clmd->coll_parms)
return derivedData;
return dm;
}
result = clothModifier_do(clmd, md->scene, ob, derivedData, useRenderParams, isFinalCalc);
result = clothModifier_do(clmd, md->scene, ob, dm);
if(result)
{
CDDM_calc_normals(result);
return result;
}
return derivedData;
return dm;
}
static void updateDepgraph(

18
source/blender/modifiers/intern/MOD_fluidsim.c
View File

@ -70,9 +70,10 @@ static void copyData(ModifierData *md, ModifierData *target)
static DerivedMesh * applyModifier(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
int useRenderParams, int isFinalCalc)
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
DerivedMesh *dm,
int useRenderParams,
int isFinalCalc)
{
FluidsimModifierData *fluidmd= (FluidsimModifierData*) md;
DerivedMesh *result = NULL;
@ -83,17 +84,12 @@ static DerivedMesh * applyModifier(
initData(md);
if(!fluidmd->fss)
return derivedData;
return dm;
}
result = fluidsimModifier_do(fluidmd, md->scene, ob, derivedData, useRenderParams, isFinalCalc);
result= fluidsimModifier_do(fluidmd, md->scene, ob, dm, useRenderParams, isFinalCalc);
if(result)
{
return result;
}
return derivedData;
return result ? result : dm;
}
static void updateDepgraph(

3
source/blender/modifiers/intern/MOD_fluidsim_util.c
View File

@ -546,8 +546,7 @@ DerivedMesh *fluidsim_read_cache(DerivedMesh *orgdm, FluidsimModifierData *fluid
DerivedMesh *fluidsimModifier_do(FluidsimModifierData *fluidmd, Scene *scene,
Object *UNUSED(ob),
DerivedMesh *dm,
int useRenderParams,
int UNUSED(isFinalCalc))
int useRenderParams)
{
#ifndef DISABLE_ELBEEM
DerivedMesh *result = NULL;

6
source/blender/modifiers/intern/MOD_smoke.c
View File

@ -76,13 +76,13 @@ static void deformVerts(ModifierData *md, Object *ob,
DerivedMesh *derivedData,
float (*vertexCos)[3],
int UNUSED(numVerts),
int useRenderParams,
int isFinalCalc)
int UNUSED(useRenderParams),
int UNUSED(isFinalCalc))
{
SmokeModifierData *smd = (SmokeModifierData*) md;
DerivedMesh *dm = dm= get_cddm(ob, NULL, derivedData, vertexCos);
smokeModifier_do(smd, md->scene, ob, dm, useRenderParams, isFinalCalc);
smokeModifier_do(smd, md->scene, ob, dm);
if(dm != derivedData)
dm->release(dm);