Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 27 Feb 2018 09:45:20 +0000 (20:45 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 27 Feb 2018 09:45:33 +0000 (20:45 +1100)
commitaa592cc00cb4d434afec53dd5c3869d19bb48327
treec86de0a229005712c5f3cd2812e3a9fcdac1b9aa
parent50d03de60039f8d474cbf5711260e43a28d2d177
parenta7ef3126115e907e03efac2297eea725017477f2
Merge branch 'master' into blender2.8
source/blender/gpu/intern/gpu_select_pick.c