Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 10 May 2017 18:40:31 +0000 (20:40 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 10 May 2017 18:40:31 +0000 (20:40 +0200)
commit50b67d83a9eb2f19fe3ed09efa99a253ea9ec136
tree4ade86e5bc04e67beeefd0a6206f59763ef08ea2
parentf305aba8688a2b88b6495985435cc79213a22a3f
parent42c346028f535968dfb90ca446e794dd2bc874f9
Merge branch 'master' into blender2.8

Conflicts:
source/blender/makesrna/intern/rna_space.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/makesrna/intern/rna_space.c