Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 16 Jan 2018 11:07:43 +0000 (12:07 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 16 Jan 2018 11:07:43 +0000 (12:07 +0100)
commitcfe6b83134fdc8972158d22cccc512993b66db36
treecda7ce3f073f09ac1a3c1e102773f22377f308df
parent2346e0850fdee44ad13fc5964fac58aee453e37a
parent67e4b1d3e9fdb70b5007aeb00dd31482b649ee19
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/readfile.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h