Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 6 May 2017 12:54:28 +0000 (22:54 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 6 May 2017 12:54:28 +0000 (22:54 +1000)
1  2 
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_query.c
source/blender/bmesh/tools/bmesh_intersect.c