Bastien Montagne 8f670dd855 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_material.h
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/library_remap.c
	source/blender/blenkernel/intern/material.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/render/render_preview.c
	source/blender/makesrna/intern/rna_object.c

2018-05-29 16:02:53 +02:00

..

intern

Merge branch 'master' into blender2.8

2018-05-29 16:02:53 +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