Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 14 Jun 2017 07:17:00 +0000 (17:17 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 14 Jun 2017 07:17:00 +0000 (17:17 +1000)
commit26efc7bbd1d15bfea9c1bd0538a27d13c9620f3b
tree735af15bb380cf8dcc85b609cc5cc46ea8c9f9dc
parenta394d681775cc9f5e83a28fb12c0d6aba1a6681c
parent2462320210fa6b625ebbcd0ddde770fc2d4e2155
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_view.c
source/blender/gpu/intern/gpu_select.c
source/blender/gpu/intern/gpu_select_sample_query.c
source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c