Bastien Montagne 6371f8ff8a Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/space_view3d/view3d_draw.c

2016-10-10 12:41:32 +02:00

..

extern/include

OpenGL render: Move file writing to a separate thread

2016-09-16 10:31:37 +02:00

intern

Merge branch 'master' into blender2.8

2016-10-10 12:41:32 +02:00

CMakeLists.txt

Refactor translation code out of blenfont

2015-08-18 07:01:26 +10:00