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)
commit18a96e39ea9318d7cca1d4d0bfc19ad81a6dff34
tree1670dc639a2b5dc0969d8edcc56bf70b0425214d
parent56859ae7fd810db0e7409dafb72f26f8bef0e5ae
parent37bc3850cee29b10f4b5a4ff76e663c95b31f1dc
Merge branch 'master' into blender2.8
source/blender/editors/space_node/node_edit.c