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)
commit34a45c54e00c18da06df97674e1d614c24ae58bf
tree59d5a82129e8df713f4284cfe456ee66162bbb38
parentc05a8460a6493429a8bd08973eec4615ed0c066f
parent51f14cfa43e5fe4bdea6fbd5c668a44919657f99
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/editors/interface/interface_eyedropper_color.c