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

Conflicts:
	source/blender/blenkernel/intern/blendfile.c
	source/blender/blenloader/intern/readfile.h
	source/blender/blenloader/intern/versioning_250.c
	source/blender/blenloader/intern/versioning_260.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/blenloader/intern/versioning_legacy.c
	source/blender/editors/render/render_shading.c
	source/blender/makesrna/intern/rna_movieclip.c
	source/blender/render/intern/source/pipeline.c
	source/blender/render/intern/source/voxeldata.c

2018-06-05 17:02:50 +02:00

..

extern/include

Merge branch 'master' into blender2.8

2018-06-01 18:26:42 +02:00

intern

Merge branch 'master' into blender2.8

2018-06-05 17:02:50 +02:00

CMakeLists.txt

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +02:00