Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Fri, 12 May 2017 13:36:52 +0000 (15:36 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Fri, 12 May 2017 13:36:52 +0000 (15:36 +0200)
1  2 
source/blender/editors/space_node/node_edit.c