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

Conflicts:
	source/blender/editors/space_outliner/outliner_draw.c

2017-03-17 15:38:45 +01:00

build_files

move Gawain library to intern

2017-03-16 23:32:35 -04:00

doc

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

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

extern

Fix T49603: Blender/Cycles 2.78 CUDA error on Jetson-TX1~

2017-03-08 13:38:01 +01:00

intern

Merge branch 'master' into blender2.8

2017-03-17 15:38:45 +01:00

release

Merge branch 'master' into blender2.8

2017-03-17 11:00:41 +01:00

source

Merge branch 'master' into blender2.8

2017-03-17 15:38:45 +01:00

tests

Outliner/layer: fix users trying to drop a collection into itself (recursion hell)

2017-03-13 17:38:37 +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-12 03:00:06 +11: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

No description provided

841 MiB

Languages

C++ 78%

Python 14.9%

C 2.9%

GLSL 1.9%

CMake 1.2%

Other 0.9%