Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 28 Feb 2018 02:11:17 +0000 (03:11 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 28 Feb 2018 02:11:17 +0000 (03:11 +0100)
commitc0d6627dc5fd069ec31c116e98e1817a0fe20ebb
tree3917fd81f0d7924da0e9099984f0558ff06bc788
parentc9a292793011cc813f20bcae0225a13cc82bdea4
parent8a7eb6c4c1677cca8349ac250cd8f3c8ccdbd385
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/gpu/intern/gpu_select.c
source/blender/gpu/intern/gpu_select_pick.c
source/blender/gpu/intern/gpu_select_sample_query.c