[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32618] trunk/blender/source/blender: remove unused args for some modifiers, no functional change.
Campbell Barton
ideasman42 at gmail.com
Thu Oct 21 03:10:23 CEST 2010
Revision: 32618
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32618
Author: campbellbarton
Date: 2010-10-21 03:10:22 +0200 (Thu, 21 Oct 2010)
Log Message:
-----------
remove unused args for some modifiers, no functional change.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_cloth.h
trunk/blender/source/blender/blenkernel/BKE_smoke.h
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
Modified: trunk/blender/source/blender/blenkernel/BKE_cloth.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_cloth.h 2010-10-21 01:08:12 UTC (rev 32617)
+++ trunk/blender/source/blender/blenkernel/BKE_cloth.h 2010-10-21 01:10:22 UTC (rev 32618)
@@ -222,7 +222,7 @@
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);
Modified: trunk/blender/source/blender/blenkernel/BKE_smoke.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_smoke.h 2010-10-21 01:08:12 UTC (rev 32617)
+++ trunk/blender/source/blender/blenkernel/BKE_smoke.h 2010-10-21 01:10:22 UTC (rev 32618)
@@ -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);
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2010-10-21 01:08:12 UTC (rev 32617)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2010-10-21 01:10:22 UTC (rev 32618)
@@ -423,7 +423,7 @@
/************************************************
* 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;
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2010-10-21 01:08:12 UTC (rev 32617)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2010-10-21 01:10:22 UTC (rev 32618)
@@ -3260,7 +3260,7 @@
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;
}
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2010-10-21 01:08:12 UTC (rev 32617)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2010-10-21 01:10:22 UTC (rev 32618)
@@ -1270,7 +1270,7 @@
}
}
}
-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))
{
Modified: trunk/blender/source/blender/modifiers/intern/MOD_array.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_array.c 2010-10-21 01:08:12 UTC (rev 32617)
+++ trunk/blender/source/blender/modifiers/intern/MOD_array.c 2010-10-21 01:10:22 UTC (rev 32618)
@@ -729,26 +729,27 @@
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);
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_cloth.c 2010-10-21 01:08:12 UTC (rev 32617)
+++ trunk/blender/source/blender/modifiers/intern/MOD_cloth.c 2010-10-21 01:10:22 UTC (rev 32618)
@@ -62,7 +62,9 @@
}
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 @@
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(
Modified: trunk/blender/source/blender/modifiers/intern/MOD_fluidsim.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_fluidsim.c 2010-10-21 01:08:12 UTC (rev 32617)
+++ trunk/blender/source/blender/modifiers/intern/MOD_fluidsim.c 2010-10-21 01:10:22 UTC (rev 32618)
@@ -70,9 +70,10 @@
-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 @@
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(
Modified: trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c 2010-10-21 01:08:12 UTC (rev 32617)
+++ trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c 2010-10-21 01:10:22 UTC (rev 32618)
@@ -546,8 +546,7 @@
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;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_smoke.c 2010-10-21 01:08:12 UTC (rev 32617)
+++ trunk/blender/source/blender/modifiers/intern/MOD_smoke.c 2010-10-21 01:10:22 UTC (rev 32618)
@@ -76,13 +76,13 @@
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);
More information about the Bf-blender-cvs
mailing list