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_armature.c | |
| parent | 35ab6cabbf62187290e417dba6d8b18cd4fe18de (diff) | |
| parent | b1019a56b54294fc91293c5c43ef46d54950ae84 (diff) | |
svn merge -r41751:41779 ^/trunk/blender
Diffstat (limited to 'source/blender/modifiers/intern/MOD_armature.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_armature.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index b089fead356..55fcf1a9367 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -110,7 +110,7 @@ static void updateDepgraph(ModifierData *md, DagForest *forest, DagNode *curNode = dag_get_node(forest, amd->object); dag_add_relation(forest, curNode, obNode, - DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Armature Modifier"); + DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Armature Modifier"); } } @@ -169,7 +169,7 @@ static void deformMatricesEM( if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data, 0); armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts, - amd->deformflag, NULL, amd->defgrp_name); + amd->deformflag, NULL, amd->defgrp_name); if(!derivedData) dm->release(dm); } @@ -183,7 +183,7 @@ static void deformMatrices(ModifierData *md, Object *ob, DerivedMesh *derivedDat if(!derivedData) dm = CDDM_from_mesh((Mesh*)ob->data, ob); armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts, - amd->deformflag, NULL, amd->defgrp_name); + amd->deformflag, NULL, amd->defgrp_name); if(!derivedData) dm->release(dm); } |