Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 9 Mar 2017 05:47:31 +0000 (16:47 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 9 Mar 2017 05:47:31 +0000 (16:47 +1100)
commitb40a4f66b250ceafb8a9b8e6b644a8f1df802c1c
tree90844a3f9fb41f38ac37a26783b506d138a5a5a9
parent696ed6d3caef5ad81c011d435fd02f82f6c231d3
parent4ab322fdd2e019ba337b2560a2d36f2175c03a32
Merge branch 'master' into blender2.8
source/blender/editors/armature/armature_select.c
source/blender/editors/armature/editarmature_sketch.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/gpu/CMakeLists.txt
source/blender/makesdna/DNA_userdef_types.h