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)
commit3d6cc77cbd8fc1dbd92d186486d038857e6eda62
tree0a615d7dcce64a8ba19dd70a1448a37d4312865d
parent32f85c8322e872951c7029fece0dc7d9102ed2b5
parent4838512e7d495cb74ac599a8cd4c788d006c843c
Merge branch 'master' into blender2.8
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/makesrna/intern/rna_ui_api.c