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

Julian Eisel 1dfb89d229 Merge branch 'master' into blender2.8 ...

Conflicts:
	intern/ghost/intern/GHOST_ContextCGL.mm
	intern/ghost/intern/GHOST_WindowCocoa.mm
	source/blender/makesrna/intern/rna_main.c

2016-09-23 01:40:19 +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-09-23 01:40:19 +02:00

CMakeLists.txt

Refactor translation code out of blenfont

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