Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Wed, 17 Jan 2018 11:21:05 +0000 (12:21 +0100)
committerSybren A. Stüvel <sybren@stuvel.eu>
Wed, 17 Jan 2018 11:21:05 +0000 (12:21 +0100)
commit971a44fe088a6053c5f28f8617c45e956f383db9
treeb3e4c079cec95a7374670e90ea8e76d29d4225b5
parentca5987c8a5ad5def6354ca306bcdbc8626bf059c
parentc38ebf93e356a97b3013b075e1d98268df891809
Merge branch 'master' into blender2.8
source/blender/editors/space_graph/graph_edit.c