This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Sybren A. Stüvel 781108cdc6 Merge branch 'master' into blender2.8 ...

# Conflicts:
#	source/blender/alembic/intern/abc_exporter.cc
#	source/blender/alembic/intern/abc_exporter.h

2017-04-19 15:07:54 +02:00

build_files

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

2017-04-18 16:30:13 +02:00

doc

Remove all instances of OBACT from drawobject.c and related changes

2017-03-02 17:09:24 +01:00

extern

Upgrade glew to v2.0

2017-04-10 14:53:32 +02:00

intern

Cleanup: set-but-unused warning

2017-04-19 15:57:37 +10:00

release

Merge branch 'master' into blender2.8

2017-04-19 15:07:54 +02:00

source

Merge branch 'master' into blender2.8

2017-04-19 15:07:54 +02:00

tests

Merge branch 'master' into blender2.8

2017-04-19 15:07:54 +02: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

Merge branch 'master' into blender2.8

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

CMakeLists.txt

Add fatal error in CMake when trying to build WITH_GAMEENGINE but without WITH_LEGACY_OPENGL

2017-04-14 17:16:15 +02:00

COPYING

== docs ==

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

GNUmakefile

Merge branch 'master' into blender2.8

2017-03-12 03:00:06 +11:00

make.bat

Use Git submodule tracking feature

2017-02-20 10:16:58 +01:00

Description

Archive of Blender with old branches

823 MiB

Languages

C 67.4%

C++ 23.4%

Python 6.1%

CMake 1.5%

GLSL 1.1%

Other 0.4%