Dalai Felinto 44517c5f21 Merge commit '212a8d9e5ae7' into blender2.8 ...

Considerable non-trivial merge conflict fixes.

2017-11-15 07:40:27 -02:00

build_files

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

2017-11-13 11:48:48 -02:00

doc

Merge branch 'master' into blender2.8

2017-10-21 12:43:17 +11:00

extern

CMake: cleanup

2017-10-30 18:48:27 +11:00

intern

Merge commit '212a8d9e5ae7' into blender2.8

2017-11-15 07:40:27 -02:00

release

Eevee: SSS: Add Quality settings.

2017-11-14 02:17:34 +01:00

source

Merge commit '212a8d9e5ae7' into blender2.8

2017-11-15 07:40:27 -02:00

tests

Layers Unittest: Hidden flag to quckly update diffs

2017-11-10 13:01:05 -02:00

.arcconfig

Blender 2.8: Update arc config

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

.gitignore

Build: add scripts to build dependencies for Windows and macOS.

2017-08-07 17:46:06 +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-11-07 03:08:24 +01:00

COPYING

== docs ==

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

GNUmakefile

GNUmakefile: add back 'git pull'

2017-09-29 19:02:20 +10:00

make.bat

Merge branch 'master' into blender2.8

2017-09-11 16:52:53 +10: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%