Bastien Montagne 50b67d83a9 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/makesrna/intern/rna_space.c

2017-05-10 20:40:31 +02:00

build_files

Merge branch 'master' into blender2.8

2017-04-27 21:42:08 +10:00

doc

Merge branch 'master' into blender2.8

2017-04-29 16:32:30 +10:00

extern

Merge branch 'master' into blender2.8

2017-04-30 03:06:42 +10:00

intern

Merge remote-tracking branch 'origin/master' into blender2.8

2017-05-09 17:56:16 +02:00

release

Eevee: Post process parameters.

2017-05-10 16:03:25 +02:00

source

Merge branch 'master' into blender2.8

2017-05-10 20:40:31 +02:00

tests

Merge branch 'master' into blender2.8

2017-04-28 15:52:07 +02:00

.arcconfig

Blender 2.8: Update arc config

2017-05-01 15:20:19 +02:00

.gitignore

Update .gitignore to some more generated/non-git-stored files.

2016-08-21 22:40:57 +02:00

.gitmodules

Merge branch 'master' into blender2.8

2017-04-03 15:15:56 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2017-05-02 15:29:00 +02:00

COPYING

== docs ==

2010-10-13 14:44:22 +00:00

GNUmakefile

Merge branch 'master' into blender2.8

2017-03-12 03:00:06 +11:00

make.bat

Merge remote-tracking branch 'origin/master' into blender2.8

2017-05-03 23:55:29 +02:00

Description

No description provided

841 MiB

Languages

C++ 78%

Python 14.9%

C 2.9%

GLSL 1.9%

CMake 1.2%

Other 0.9%