Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 3 Jan 2019 17:32:51 +0000 (18:32 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 3 Jan 2019 17:32:51 +0000 (18:32 +0100)
commit88e45b8c99c640506b88a7529b504378a2b51f32
tree844aa6cd7cc2f894942de610809e3137ec62519e
parentaa175e003386fa68f7aa24a1c947e5b6ad999f6a
parentdb03be60ec227f42bb930e9118d2ecb5f4ebbb43
Merge branch 'blender2.7'
source/blender/nodes/intern/node_socket.c