diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:05:32 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:05:32 +0400 |
| commit | e59ab6486f9e7285815671044b785c28365d5165 (patch) | |
| tree | 4a9406c8181a817a8b96243ae167acc740ed20f7 /source/blender/modifiers/intern/MOD_displace.c | |
| parent | 35ab6cabbf62187290e417dba6d8b18cd4fe18de (diff) | |
| parent | b1019a56b54294fc91293c5c43ef46d54950ae84 (diff) | |
svn merge -r41751:41779 ^/trunk/blender
Diffstat (limited to 'source/blender/modifiers/intern/MOD_displace.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_displace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 5bb8f0aefbf..7a23dd45dd6 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -157,13 +157,13 @@ static void updateDepgraph(ModifierData *md, DagForest *forest, DagNode *curNode = dag_get_node(forest, dmd->map_object); dag_add_relation(forest, curNode, obNode, - DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Displace Modifier"); + DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Displace Modifier"); } if(dmd->texmapping == MOD_DISP_MAP_GLOBAL) dag_add_relation(forest, obNode, obNode, - DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Displace Modifier"); + DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Displace Modifier"); } @@ -245,7 +245,7 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *dm= get_cddm(ob, NULL, derivedData, vertexCos); displaceModifier_do((DisplaceModifierData *)md, ob, dm, - vertexCos, numVerts); + vertexCos, numVerts); if(dm != derivedData) dm->release(dm); @@ -258,7 +258,7 @@ static void deformVertsEM( DerivedMesh *dm= get_cddm(ob, editData, derivedData, vertexCos); displaceModifier_do((DisplaceModifierData *)md, ob, dm, - vertexCos, numVerts); + vertexCos, numVerts); if(dm != derivedData) dm->release(dm); |