Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 5 Apr 2017 13:36:55 +0000 (15:36 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 5 Apr 2017 13:36:55 +0000 (15:36 +0200)
commit3bb88a7807d00560351a0ca6768b8339fa019d2b
treef47647aa9600358eab91f39179a86504cf5e1132
parent929c45b7d40536ce5fe572d19ebcbb70e9416a42
parentf921442a441abbb458ed540f55c24372971acff7
Merge branch 'master' into blender2.8
source/blender/depsgraph/intern/builder/deg_builder.cc
source/blender/depsgraph/intern/builder/deg_builder.h