Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Thu, 9 Mar 2017 16:10:06 +0000 (17:10 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 9 Mar 2017 16:10:06 +0000 (17:10 +0100)
commit8a6d055f3734c8a0bfeb9b6256d25bfb414634e6
tree17ec0b453d351f56d3a3511b9d50773f1fc8271f
parent528cb8877f3c8923752a016854682722708c47a0
parent6c942db30dee14eb37229879656fa049a9ac6df6
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/editors/armature/armature_select.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_text/text_draw.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_view.c