Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 6 May 2018 18:15:14 +0000 (20:15 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 6 May 2018 18:15:14 +0000 (20:15 +0200)
commita9ea7864ae0e993be045e58dc924f65f0e20cc03
tree62220b636e2c3ed7b915ac002b2b1168aa4bbf79
parentc9ed78733cc99296e90434f085651cc83fe0a7d1
parent9bd2e9104a05cd95c8397204cbc11e5943064b9d
Merge branch 'master' into blender2.8
source/blender/editors/space_node/node_templates.c