Merge branch 'master' into 28
authorCampbell Barton <ideasman42@gmail.com>
Wed, 3 May 2017 16:58:26 +0000 (02:58 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 3 May 2017 16:58:26 +0000 (02:58 +1000)
commitb9451c04931d228161c1fb212c6c7a09545a86b7
tree8f3b828721d51516ebd997ff516c770238daa18b
parent82e242cc7287ce56d10f88a76de5418a7b20e239
parent6abcd6cfd545ecd3cb61b4ece065b10890779cd6
Merge branch 'master' into 28
source/blender/editors/space_node/drawnode.c