Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 26 Aug 2017 14:51:54 +0000 (00:51 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 26 Aug 2017 14:51:54 +0000 (00:51 +1000)
commit79111f92463c05f05d3765bff2b3c15b56df0731
tree9e6b42e316e802acbbbe486b8eb2d946f373c850
parentae04e27bfa579d04c0c78705e1aa57f57f309fd1
parent7e43210edbd9ff3148f9564a9c90d0687dde9363
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_mesh.cpp
source/blender/blenkernel/intern/library_remap.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/editors/space_outliner/outliner_edit.c