Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-10-21 05:10:22 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-10-21 05:10:22 +0400
commitfec8292df190c2a38623823bec0b1b78867b1017 (patch)
tree707ee75908c1d43db33fc23f525477ea345ff0ac /source/blender/modifiers/intern/MOD_fluidsim.c
parent16b04834b3e1046118787d40531bf38f73ec9c76 (diff)
remove unused args for some modifiers, no functional change.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_fluidsim.c')
-rw-r--r--source/blender/modifiers/intern/MOD_fluidsim.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c
index 14fb09f1c1f..d3cc653d992 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim.c
@@ -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(