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)
commit57fe9767f433dca488e5415772b1883c0026a933
treeda899cb0cacc15ef4476779b232f55ea9b2a01db
parentf7083b00ee2f8d9a28d25fb6a3e2a165d16ce327
parent2002fe27d97223f241580777b1a9073755181e45
Merge branch 'master' into blender2.8
source/blender/editors/space_node/node_edit.c