Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Fri, 16 Nov 2018 13:05:05 +0000 (14:05 +0100)
committerSybren A. Stüvel <sybren@stuvel.eu>
Fri, 16 Nov 2018 13:05:05 +0000 (14:05 +0100)
commitda344b4045ddf6265bedcae83db9d91d361f00c4
tree15111cc2f0dda3fea2f8fb92b04d2fb23aafb566
parent20963a6a06c2b77d0f012bc3826da10822b11d5e
parentec20d311da405b1150ca69c1ab462ff66630e4ec
Merge branch 'master' into blender2.8
source/blender/editors/space_clip/space_clip.c