Julian Eisel a5cba9aab9 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/space_nla/nla_draw.c
	source/blender/editors/space_view3d/view3d_draw.c

2017-03-06 13:00:46 +01:00

build_files

Merge branch 'master' into blender2.8

2017-03-02 00:22:13 +11:00

doc

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

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

extern

Fix strict compiler warning in the gflags code

2017-01-23 11:52:41 +01:00

intern

Merge branch 'master' into blender2.8

2017-03-06 13:00:46 +01:00

release

Merge branch 'master' into blender2.8

2017-03-06 13:00:46 +01:00

source

Merge branch 'master' into blender2.8

2017-03-06 13:00:46 +01:00

tests

Fixup for layer rename unittest (rB3baa186724)

2017-03-02 09:52:33 +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

Use Git submodule tracking feature

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

CMakeLists.txt

Merge branch 'master' into blender2.8

2017-03-06 13:00:46 +01:00

COPYING

== docs ==

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

GNUmakefile

Use Git submodule tracking feature

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

make.bat

Use Git submodule tracking feature

2017-02-20 10:16:58 +01: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%