Bastien Montagne 45f3150c98 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/space_view3d/drawobject.c

2017-04-10 17:34:31 +02:00

build_files

Merge branch 'master' into blender2.8

2017-04-10 16:53:12 +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

Merge branch 'master' into blender2.8

2017-04-10 17:34:31 +02:00

release

Merge branch 'master' into blender2.8

2017-04-09 16:09:12 +10:00

source

Merge branch 'master' into blender2.8

2017-04-10 17:34:31 +02:00

tests

Merge branch 'master' into blender2.8

2017-04-10 16:53:12 +02:00

.arcconfig

…

.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

New build option WITH_LEGACY_OPENGL

2017-04-06 18:46:33 +02:00

COPYING

…

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

No description provided

926 MiB

Languages

C++ 78.1%

Python 15%

C 2.8%

GLSL 1.8%

CMake 1.2%

Other 0.9%