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)
Conflicts:
source/blender/editors/space_node/drawnode.c

1  2 
build_files/build_environment/install_deps.sh
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c