Bastien Montagne 8ccb27fc0a Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/scene.c

2018-10-24 09:00:13 +02:00

build_files

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

2018-10-22 10:19:06 -06:00

doc

Fix py API docgen script for new context members.

2018-10-19 20:13:50 +02:00

extern

Merge branch 'master' into blender2.8

2018-09-12 15:54:07 +10:00

intern

I18n: tweak/fix exception catching code of pgettex() wrapper.

2018-10-24 08:23:14 +02:00

release

Fix T57366: Mesh.from_pydata invalid loose-edge state

2018-10-24 11:37:44 +11:00

source

Merge branch 'master' into blender2.8

2018-10-24 09:00:13 +02:00

tests

Merge branch 'master' into blender2.8

2018-10-09 08:46:00 +11:00

.arcconfig

Arc: Use proper lacding branch

2018-04-24 12:26:37 +02:00

.editorconfig

editorconfig: correct C/C++ using space

2018-06-19 07:48:12 +02:00

.gitignore

Revert "Gitignore: Ignore diffs in all subdirs"

2018-07-31 13:03:48 -04:00

.gitmodules

Point addons contrib to 2.8 branch

2018-10-23 09:41:12 +02:00

CMakeLists.txt

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

2018-10-22 10:19:06 -06:00

COPYING

== docs ==

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

GNUmakefile

Build: allow overriding DEPS_BUILD_DIR and DEPS_INSTALL_DIR for make deps.

2018-09-24 15:48:50 +02:00

make.bat

Cleanup: trailing space cmake, make.bat

2018-06-17 20:18:09 +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%