Bastien Montagne 9be6d5ff18 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/makesrna/intern/rna_main_api.c
	source/blender/makesrna/intern/rna_particle.c

2016-12-12 16:17:57 +01:00

build_files

Merge branch 'master' into blender2.8

2016-12-12 16:17:57 +01:00

doc

Fix T50007: blender offline python documentation in zipped HTML files, not shown correctly.

2016-11-13 12:06:26 +01:00

extern

[msvc2017] remove eigen vector workaround for msvc2017.

2016-11-28 10:12:21 -07:00

intern

Merge branch 'master' into blender2.8

2016-12-12 16:17:57 +01:00

release

Merge branch 'master' into blender2.8

2016-12-12 16:17:57 +01:00

source

Merge branch 'master' into blender2.8

2016-12-12 16:17:57 +01:00

tests

tests: Update hash for OBJ

2016-11-02 15:35:18 +01:00

.arcconfig

Use HTTPS protocol for arc

2013-12-24 22:57:27 +06:00

.gitignore

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

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

.gitmodules

Add developer tools submodule

2016-07-15 01:28:00 +10:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2016-12-12 16:17:57 +01:00

COPYING

== docs ==

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

GNUmakefile

Cleanup: line length

2016-07-15 01:26:26 +10:00

make.bat

[MSVC] Preliminary VS2017 support.

2016-11-16 20:13:58 -07: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%