diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-16 12:36:24 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-16 12:36:24 +0300 |
| commit | 9bf209f24ba5f45fdb4b417a5cb0d21183c6a431 (patch) | |
| tree | 8cfc2c6b2e91bb06b54f602096c827c84b6da541 /source/blender/modifiers/intern/MOD_cloth.c | |
| parent | 3beb83327fa0d1555732b0b0b625c4e971225a48 (diff) | |
| parent | 30527e3e55a1125574265607a8c53acaae1f526c (diff) | |
Merge branch 'master' into depsgraph_refactor
Conflicts:
CMakeLists.txt
build_files/scons/tools/btools.py
intern/cycles/util/util_types.h
source/blender/editors/object/object_constraint.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_cloth.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_cloth.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 88e1c03eb1b..f7497199469 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -118,7 +118,9 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, dm->release(dm); } -static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, Object *ob, DagNode *obNode) +static void updateDepgraph(ModifierData *md, DagForest *forest, + struct Main *UNUSED(bmain), + Scene *scene, Object *ob, DagNode *obNode) { ClothModifierData *clmd = (ClothModifierData *) md; |