Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 6 Sep 2018 09:31:58 +0000 (11:31 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 6 Sep 2018 09:31:58 +0000 (11:31 +0200)
commit8a3adaa48568382c1d0e67fabb8ec3d07b94dd42
tree6211427d0fe723e99c0f6e5a6779594d31254171
parent5f669240663649ee5532f935a8178bf9db7b10cf
parentbb98eef777cbc3484bfcb50ea460b9c5622e9200
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/space_node/drawnode.c
build_files/build_environment/install_deps.sh
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c