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)
1  2 
source/blender/editors/space_node/node_templates.c