Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 12 Dec 2017 05:13:06 +0000 (16:13 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 12 Dec 2017 05:13:06 +0000 (16:13 +1100)
commitedd39f6da719da9660358e33012cc1cf4db89e94
tree85ba58672660336a82a3c4c32b7d55d1bd9d8608
parent41fc0a0624230e50ee4f8521915e093d1dee0bf2
parentb3c147a04f16f6fe8ea4c902f9d58ec5dbcdb392
Merge branch 'master' into blender2.8
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/interface/interface_eyedropper_depth.c
source/blender/editors/interface/interface_eyedropper_driver.c
source/blender/editors/interface/interface_intern.h