Bastien Montagne 6a65fc3456 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/modifiers/intern/MOD_wireframe.c

2018-01-24 12:14:59 +01:00

build_files

Merge branch 'master' into blender2.8

2018-01-24 11:45:34 +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

2018-01-24 12:14:59 +01:00

release

Merge branch 'master' into blender2.8

2018-01-24 11:45:34 +11:00

source

Merge branch 'master' into blender2.8

2018-01-24 12:14:59 +01:00

tests

Fix collections names no longer unique when moved around

2018-01-19 18:44:11 -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:54:26 +02:00

.gitmodules

Merge branch 'master' into blender2.8

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

CMakeLists.txt

CMake: bump minimum version to 3.5

2017-12-17 01:04:05 +11:00

COPYING

== docs ==

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

GNUmakefile

Build: auto detection of libraries built by "make deps" on Linux.

2018-01-11 22:30:31 +01: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%