Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 27 Aug 2017 06:35:51 +0000 (16:35 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 27 Aug 2017 06:35:51 +0000 (16:35 +1000)
commitca9801bd427ce2e76a992b62d476859efcc14547
tree49c493c3d7ac7348240040a7b2dd3eba3c2bce60
parent2ff7ba2c6ce3af5eed22d5394d1098a3974f268b
parentc90452e111abae7817b02ad848b358eb77a44252
Merge branch 'master' into blender2.8
source/blender/bmesh/intern/bmesh_mesh_conv.c
tests/gtests/blenlib/CMakeLists.txt