diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-28 15:54:27 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-28 15:55:21 +0300 |
commit | b024ccd61992e33c62485a80c903a0f284d42dc5 (patch) | |
tree | 8f27687cdced8b217ca97ddc99b50c18a1ceecfb /source/blender/blenkernel/intern/depsgraph.c | |
parent | c53b1e2a93e17eb353d0dfa1472d501fd023d05f (diff) |
Fix T45929: OpenSubdiv was doing extra object recalc tags
Diffstat (limited to 'source/blender/blenkernel/intern/depsgraph.c')
-rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 1e286b345ca..0d74c3507b4 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -1143,9 +1143,12 @@ void dag_add_relation(DagForest *forest, DagNode *fob1, DagNode *fob2, short rel if ((rel & DAG_RL_DATA_DATA) != 0) { if (fob1->type == ID_OB) { if ((fob1->eval_flags & DAG_EVAL_NEED_CPU) == 0) { - Object *object = fob1->ob; - /* Make sure object has all the data on CPU. */ - object->recalc |= OB_RECALC_DATA; + Object *ob2 = fob2->ob; + if (ob2->recalc & OB_RECALC_ALL) { + /* Make sure object has all the data on CPU. */ + Object *ob1 = fob1->ob; + ob1->recalc |= OB_RECALC_DATA; + } fob1->eval_flags |= DAG_EVAL_NEED_CPU; } } |