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_displace.c
parent900c8a91548ab867391aa8d130cd03ff2d0e3d21 (diff)
style cleanup: modifiers
Diffstat (limited to 'source/blender/modifiers/intern/MOD_displace.c')
-rw-r--r--source/blender/modifiers/intern/MOD_displace.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index 4d9b8de061e..fd3ebada170 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -58,7 +58,7 @@
static void initData(ModifierData *md)
{
- DisplaceModifierData *dmd = (DisplaceModifierData*) md;
+ DisplaceModifierData *dmd = (DisplaceModifierData *) md;
dmd->texture = NULL;
dmd->strength = 1;
@@ -68,8 +68,8 @@ static void initData(ModifierData *md)
static void copyData(ModifierData *md, ModifierData *target)
{
- DisplaceModifierData *dmd = (DisplaceModifierData*) md;
- DisplaceModifierData *tdmd = (DisplaceModifierData*) target;
+ DisplaceModifierData *dmd = (DisplaceModifierData *) md;
+ DisplaceModifierData *tdmd = (DisplaceModifierData *) target;
tdmd->texture = dmd->texture;
tdmd->strength = dmd->strength;
@@ -114,17 +114,17 @@ static int dependsOnNormals(ModifierData *md)
}
static void foreachObjectLink(ModifierData *md, Object *ob,
- ObjectWalkFunc walk, void *userData)
+ ObjectWalkFunc walk, void *userData)
{
- DisplaceModifierData *dmd = (DisplaceModifierData*) md;
+ DisplaceModifierData *dmd = (DisplaceModifierData *) md;
walk(userData, ob, &dmd->map_object);
}
static void foreachIDLink(ModifierData *md, Object *ob,
- IDWalkFunc walk, void *userData)
+ IDWalkFunc walk, void *userData)
{
- DisplaceModifierData *dmd = (DisplaceModifierData*) md;
+ DisplaceModifierData *dmd = (DisplaceModifierData *) md;
walk(userData, ob, (ID **)&dmd->texture);
@@ -132,24 +132,24 @@ static void foreachIDLink(ModifierData *md, Object *ob,
}
static void foreachTexLink(ModifierData *md, Object *ob,
- TexWalkFunc walk, void *userData)
+ TexWalkFunc walk, void *userData)
{
walk(userData, ob, md, "texture");
}
static int isDisabled(ModifierData *md, int UNUSED(useRenderParams))
{
- DisplaceModifierData *dmd = (DisplaceModifierData*) md;
+ DisplaceModifierData *dmd = (DisplaceModifierData *) md;
return (!dmd->texture || dmd->strength == 0.0f);
}
static void updateDepgraph(ModifierData *md, DagForest *forest,
- struct Scene *UNUSED(scene),
- Object *UNUSED(ob),
- DagNode *obNode)
+ struct Scene *UNUSED(scene),
+ Object *UNUSED(ob),
+ DagNode *obNode)
{
- DisplaceModifierData *dmd = (DisplaceModifierData*) md;
+ DisplaceModifierData *dmd = (DisplaceModifierData *) md;
if (dmd->map_object && dmd->texmapping == MOD_DISP_MAP_OBJECT) {
DagNode *curNode = dag_get_node(forest, dmd->map_object);
@@ -167,15 +167,15 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
/* dm must be a CDDerivedMesh */
static void displaceModifier_do(
- DisplaceModifierData *dmd, Object *ob,
- DerivedMesh *dm, float (*vertexCos)[3], int numVerts)
+ DisplaceModifierData *dmd, Object *ob,
+ DerivedMesh *dm, float (*vertexCos)[3], int numVerts)
{
int i;
MVert *mvert;
MDeformVert *dvert;
int defgrp_index;
float (*tex_co)[3];
- float weight= 1.0f; /* init value unused but some compilers may complain */
+ float weight = 1.0f; /* init value unused but some compilers may complain */
if (!dmd->texture) return;
if (dmd->strength == 0.0f) return;
@@ -184,7 +184,7 @@ static void displaceModifier_do(
modifier_get_vgroup(ob, dm, dmd->defgrp_name, &dvert, &defgrp_index);
tex_co = MEM_callocN(sizeof(*tex_co) * numVerts,
- "displaceModifier_do tex_co");
+ "displaceModifier_do tex_co");
get_texture_coords((MappingInfoModifierData *)dmd, ob, dm, vertexCos, tex_co, numVerts);
modifier_init_texture(dmd->modifier.scene, dmd->texture);
@@ -194,7 +194,7 @@ static void displaceModifier_do(
float delta = 0, strength = dmd->strength;
if (dvert) {
- weight= defvert_find_weight(dvert + i, defgrp_index);
+ weight = defvert_find_weight(dvert + i, defgrp_index);
if (weight == 0.0f) continue;
}
@@ -235,13 +235,13 @@ static void displaceModifier_do(
}
static void deformVerts(ModifierData *md, Object *ob,
- DerivedMesh *derivedData,
- float (*vertexCos)[3],
- int numVerts,
- int UNUSED(useRenderParams),
- int UNUSED(isFinalCalc))
+ DerivedMesh *derivedData,
+ float (*vertexCos)[3],
+ int numVerts,
+ int UNUSED(useRenderParams),
+ int UNUSED(isFinalCalc))
{
- DerivedMesh *dm= get_cddm(ob, NULL, derivedData, vertexCos);
+ DerivedMesh *dm = get_cddm(ob, NULL, derivedData, vertexCos);
displaceModifier_do((DisplaceModifierData *)md, ob, dm,
vertexCos, numVerts);
@@ -251,10 +251,10 @@ static void deformVerts(ModifierData *md, Object *ob,
}
static void deformVertsEM(
- ModifierData *md, Object *ob, struct BMEditMesh *editData,
- DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
+ ModifierData *md, Object *ob, struct BMEditMesh *editData,
+ DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{
- DerivedMesh *dm= get_cddm(ob, editData, derivedData, vertexCos);
+ DerivedMesh *dm = get_cddm(ob, editData, derivedData, vertexCos);
displaceModifier_do((DisplaceModifierData *)md, ob, dm,
vertexCos, numVerts);
@@ -269,8 +269,8 @@ ModifierTypeInfo modifierType_Displace = {
/* structName */ "DisplaceModifierData",
/* structSize */ sizeof(DisplaceModifierData),
/* type */ eModifierTypeType_OnlyDeform,
- /* flags */ eModifierTypeFlag_AcceptsMesh
- | eModifierTypeFlag_SupportsEditmode,
+ /* flags */ eModifierTypeFlag_AcceptsMesh |
+ eModifierTypeFlag_SupportsEditmode,
/* copyData */ copyData,
/* deformVerts */ deformVerts,