archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

svn merge -r41751:41779 ^/trunk/blender

Browse Source
This commit is contained in:
Campbell Barton
2011-11-15 02:05:32 +00:00
parent 35ab6cabbf b1019a56b5
commit e59ab6486f
217 changed files with 1549 additions and 1190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/modifiers/intern/MOD_lattice.c
View File

@@ -98,7 +98,7 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
DagNode *latNode = dag_get_node(forest, lmd->object);
dag_add_relation(forest, latNode, obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Lattice Modifier");
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Lattice Modifier");
}
}
@@ -115,7 +115,7 @@ static void deformVerts(ModifierData *md, Object *ob,
modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */
lattice_deform_verts(lmd->object, ob, derivedData,
vertexCos, numVerts, lmd->name);
vertexCos, numVerts, lmd->name);
}
static void deformVertsEM(