Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Tue, 25 Apr 2017 15:04:17 +0000 (17:04 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Tue, 25 Apr 2017 15:04:17 +0000 (17:04 +0200)
commit6822e353ffa90e1fe8290b243b1bc2c43d5d157a
treec843437f17399f8c4b1652c5433286c6537e1665
parent99d2d6f3871f88c485684c6f9c8b5f0ab0d8dda3
parent9dadd5ff937f81cc1e5aa9136b8eafb5a5414bb1
Merge branch 'master' into blender2.8
source/blender/alembic/intern/abc_mesh.cc
source/blender/alembic/intern/abc_object.cc
source/blender/alembic/intern/alembic_capi.cc
source/blender/editors/uvedit/uvedit_draw.c
source/blender/windowmanager/intern/wm_files.c
tests/python/bl_alembic_import_test.py