Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Wed, 13 Jun 2018 12:19:57 +0000 (14:19 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Wed, 13 Jun 2018 12:19:57 +0000 (14:19 +0200)
1  2 
source/blender/editors/space_node/node_edit.c