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>2012-05-06 17:38:33 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-06 17:38:33 +0400
commit3d8e58751c3801a6ad2e00ed7c35059e827059b2 (patch)
tree9eb8ec613a1dad477b9607a6371b723d0be25650 /source/blender/modifiers/intern/MOD_smoke.c
parent900c8a91548ab867391aa8d130cd03ff2d0e3d21 (diff)
style cleanup: modifiers
Diffstat (limited to 'source/blender/modifiers/intern/MOD_smoke.c')
-rw-r--r--source/blender/modifiers/intern/MOD_smoke.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c
index 706c9817a0a..843f92bbbe8 100644
--- a/source/blender/modifiers/intern/MOD_smoke.c
+++ b/source/blender/modifiers/intern/MOD_smoke.c
@@ -57,7 +57,7 @@
static void initData(ModifierData *md)
{
- SmokeModifierData *smd = (SmokeModifierData*) md;
+ SmokeModifierData *smd = (SmokeModifierData *) md;
smd->domain = NULL;
smd->flow = NULL;
@@ -68,27 +68,27 @@ static void initData(ModifierData *md)
static void copyData(ModifierData *md, ModifierData *target)
{
- SmokeModifierData *smd = (SmokeModifierData*)md;
- SmokeModifierData *tsmd = (SmokeModifierData*)target;
+ SmokeModifierData *smd = (SmokeModifierData *)md;
+ SmokeModifierData *tsmd = (SmokeModifierData *)target;
smokeModifier_copy(smd, tsmd);
}
static void freeData(ModifierData *md)
{
- SmokeModifierData *smd = (SmokeModifierData*) md;
+ SmokeModifierData *smd = (SmokeModifierData *) md;
- smokeModifier_free (smd);
+ smokeModifier_free(smd);
}
static void deformVerts(ModifierData *md, Object *ob,
- DerivedMesh *derivedData,
- float (*vertexCos)[3],
- int UNUSED(numVerts),
- int UNUSED(useRenderParams),
- int UNUSED(isFinalCalc))
+ DerivedMesh *derivedData,
+ float (*vertexCos)[3],
+ int UNUSED(numVerts),
+ int UNUSED(useRenderParams),
+ int UNUSED(isFinalCalc))
{
- SmokeModifierData *smd = (SmokeModifierData*) md;
+ SmokeModifierData *smd = (SmokeModifierData *) md;
DerivedMesh *dm = get_cddm(ob, NULL, derivedData, vertexCos);
smokeModifier_do(smd, md->scene, ob, dm);
@@ -103,9 +103,9 @@ static int dependsOnTime(ModifierData *UNUSED(md))
}
static void updateDepgraph(ModifierData *md, DagForest *forest,
- struct Scene *scene,
- Object *UNUSED(ob),
- DagNode *obNode)
+ struct Scene *scene,
+ Object *UNUSED(ob),
+ DagNode *obNode)
{
SmokeModifierData *smd = (SmokeModifierData *) md;
@@ -121,7 +121,7 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
// check for initialized smoke object
if (smd2 && (smd2->type & MOD_SMOKE_TYPE_FLOW) && smd2->flow) {
DagNode *curNode = dag_get_node(forest, go->ob);
- dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Smoke Flow");
+ dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Smoke Flow");
}
}
}
@@ -134,7 +134,7 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
// check for initialized smoke object
if (smd2 && (smd2->type & MOD_SMOKE_TYPE_COLL) && smd2->coll) {
DagNode *curNode = dag_get_node(forest, go->ob);
- dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Smoke Coll");
+ dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Smoke Coll");
}
}
}
@@ -142,12 +142,12 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
else {
Base *base = scene->base.first;
- for ( ; base; base = base->next) {
+ for (; base; base = base->next) {
SmokeModifierData *smd2 = (SmokeModifierData *)modifiers_findByType(base->object, eModifierType_Smoke);
if (smd2 && (((smd2->type & MOD_SMOKE_TYPE_FLOW) && smd2->flow) || ((smd2->type & MOD_SMOKE_TYPE_COLL) && smd2->coll))) {
DagNode *curNode = dag_get_node(forest, base->object);
- dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Smoke Flow/Coll");
+ dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Smoke Flow/Coll");
}
}
}
@@ -155,11 +155,11 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
}
static void foreachIDLink(ModifierData *md, Object *ob,
- IDWalkFunc walk, void *userData)
+ IDWalkFunc walk, void *userData)
{
- SmokeModifierData *smd = (SmokeModifierData*) md;
+ SmokeModifierData *smd = (SmokeModifierData *) md;
- if (smd->type==MOD_SMOKE_TYPE_DOMAIN && smd->domain) {
+ if (smd->type == MOD_SMOKE_TYPE_DOMAIN && smd->domain) {
walk(userData, ob, (ID **)&smd->domain->coll_group);
walk(userData, ob, (ID **)&smd->domain->fluid_group);
walk(userData, ob, (ID **)&smd->domain->eff_group);
@@ -175,9 +175,9 @@ ModifierTypeInfo modifierType_Smoke = {
/* structName */ "SmokeModifierData",
/* structSize */ sizeof(SmokeModifierData),
/* type */ eModifierTypeType_OnlyDeform,
- /* flags */ eModifierTypeFlag_AcceptsMesh
- | eModifierTypeFlag_UsesPointCache
- | eModifierTypeFlag_Single,
+ /* flags */ eModifierTypeFlag_AcceptsMesh |
+ eModifierTypeFlag_UsesPointCache |
+ eModifierTypeFlag_Single,
/* copyData */ copyData,
/* deformVerts */ deformVerts,