Bastien Montagne 204c167c72 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/mesh_convert.c
	source/blender/editors/interface/interface_eyedropper_color.c
	source/blender/editors/object/object_add.c
	source/blender/editors/space_image/image_ops.c
	source/blender/makesrna/intern/rna_image.c
	source/blender/windowmanager/intern/wm_draw.c

2018-06-11 16:02:46 +02:00

build_files

Merge branch 'master' into blender2.8

2018-06-10 08:21:50 +02:00

doc

Collections and groups unification

2018-05-18 13:34:24 +02:00

extern

Audaspace: add support for latest ffmpeg.

2018-06-08 23:11:16 +02:00

intern

GHOST: WGL: Delay context initialization for offscreen contexts.

2018-06-11 13:06:54 +02:00

release

Workbench: API Changes

2018-06-11 15:54:24 +02:00

source

Merge branch 'master' into blender2.8

2018-06-11 16:02:46 +02:00

tests

Alembic unit tests: fixed compiler errors

2018-06-08 14:48:50 +02:00

.arcconfig

Arc: Use proper lacding branch

2018-04-24 12:26:37 +02:00

.gitignore

Build: add scripts to build dependencies for Windows and macOS.

2017-08-07 17:46:06 +02:00

.gitmodules

Fix git submodules branch configuration

2018-04-23 12:55:04 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-06-10 08:21:50 +02:00

COPYING

== docs ==

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

GNUmakefile

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

2018-04-25 09:31:25 +02:00

make.bat

Merge branch 'master' into blender2.8

2018-05-27 11:06:29 +02: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%