[Bf-blender-cvs] [8a3adaa4856] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 8a3adaa48568382c1d0e67fabb8ec3d07b94dd42
Author: Bastien Montagne
Date:   Thu Sep 6 11:31:58 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB8a3adaa48568382c1d0e67fabb8ec3d07b94dd42

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/editors/space_node/drawnode.c

===================================================================



===================================================================