This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.

Bastien Montagne 5a82aee9e6 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/alembic/intern/abc_exporter.cc
	source/blender/blenkernel/BKE_mball.h
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/mball.c
	source/blender/editors/object/object_add.c
	source/blender/render/intern/source/convertblender.c

2018-05-31 16:57:39 +02:00

..

intern

Merge branch 'master' into blender2.8

2018-05-31 16:57:39 +02:00

ABC_alembic.h

Alembic: simplified sub-frame sampling

2017-05-30 13:47:51 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2017-10-29 15:38:55 +01:00