Depsgraph: Fix bug introduced by wrong merge conflict resolution
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 21 Sep 2017 11:09:49 +0000 (16:09 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 21 Sep 2017 11:09:49 +0000 (16:09 +0500)
commit77377f0ea8152d0ed5009a4940298b081b186787
treeab6417f6c1c650da520a34685fa7d7102d17951a
parent549c4bec9d8256546ef550106b9662a222ce0bbd
Depsgraph: Fix bug introduced by wrong merge conflict resolution
source/blender/depsgraph/intern/eval/deg_eval_flush.cc