Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 28 Jan 2018 04:18:33 +0000 (15:18 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 28 Jan 2018 04:18:33 +0000 (15:18 +1100)
commit88174bd22c8798fa5038a3b8d5192e052bfe673e
tree728c5654cf0fb879027b774d5b4bf964ffe543ec
parent7aaede920fd1376fc06edd45c73403f2084a64bc
parent3c852ba0741f794a697f95073b04921e9ff94039
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_mesh.cpp
source/blender/blenloader/intern/writefile.c
source/blender/editors/mesh/mesh_navmesh.c
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_wm_api.c