Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 13 Dec 2017 13:24:44 +0000 (14:24 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 13 Dec 2017 13:24:44 +0000 (14:24 +0100)
1  2 
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/makesrna/intern/rna_ui_api.c