Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 5 Apr 2017 08:02:25 +0000 (10:02 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 5 Apr 2017 08:02:25 +0000 (10:02 +0200)
commite9bb018a4aea1b4aeb692cdadce158496a270e32
tree9f8c122feb8a68cc34f5ab6c99407a20d72fa50d
parent4dadb6d4453d84d537e25e753f7904ce5c8539fb
parent8647d5af9015097698984e9864802848914e803c
Merge branch 'master' into blender2.8

Conflicts:
source/blender/alembic/intern/abc_exporter.h
build_files/build_environment/install_deps.sh
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_exporter.h
source/blender/alembic/intern/abc_util.cc
source/blender/alembic/intern/abc_util.h
source/blender/alembic/intern/alembic_capi.cc