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

Conflicts:
	source/blender/collada/MeshImporter.cpp
	source/blender/editors/object/object_add.c
	source/blender/editors/screen/screen_edit.c

2017-06-15 15:54:11 +02:00

build_files

Merge branch 'master' into blender2.8

2017-06-09 19:40:47 +10:00

doc

Merge branch 'master' into blender2.8

2017-06-15 10:17:51 +02:00

extern

Merge branch 'master' into blender2.8

2017-05-28 17:48:59 +02:00

intern

Merge branch 'master' into blender2.8

2017-06-14 10:11:18 +02:00

release

Eevee: Probes: Add data display for cubemaps.

2017-06-15 00:57:16 +02:00

source

Merge branch 'master' into blender2.8

2017-06-15 15:54:11 +02:00

tests

Layers: Scene copy should copy selection as well.

2017-06-15 13:47:14 +02:00

.arcconfig

Blender 2.8: Update arc config

2017-05-01 15:20:19 +02: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

CMake: Update clay engine message

2017-06-06 18:57:47 +02:00

COPYING

…

GNUmakefile

Merge branch 'master' into blender2.8

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

make.bat

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

2017-05-03 23:55:29 +02:00

S

Description

No description provided

925 MiB

Languages

C++ 78%

Python 11%

C 6.3%

GLSL 2.2%

CMake 1.3%

Other 1.1%