Sergey Sharybin 1fb43dcd5a Fix bad merge happened at some point

2017-12-18 16:04:06 +01:00

build_files

Merge branch 'master' into blender2.8

2017-12-11 19:24:37 +11:00

doc

Merge branch 'master' into blender2.8

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

extern

Merge branch 'master' into blender2.8

2017-11-30 18:30:41 +11:00

intern

Merge branch 'master' into blender2.8

2017-12-15 17:24:28 +01:00

release

blender_icons_update script: run Blender in factory startup.

2017-12-18 10:47:02 +01:00

source

Fix bad merge happened at some point

2017-12-18 16:04:06 +01:00

tests

Group collection viewport/render options and remove collection visibility

2017-12-15 08:56:48 -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-12-04 16:51:07 +11: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-12-12 13:55:09 +11: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%