Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Thu, 19 Jul 2018 02:02:16 +0000 (20:02 -0600)
committerRay Molenkamp <github@lazydodo.com>
Thu, 19 Jul 2018 02:02:16 +0000 (20:02 -0600)
1  2 
source/blender/editors/interface/interface_eyedropper_color.c