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

Conflicts:
	source/blender/editors/sculpt_paint/paint_image_proj.c

2018-06-19 10:52:01 +02:00

build_files

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

2018-06-18 13:40:39 -06:00

doc

Collections and groups unification

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

extern

Cleanup: whitespace

2018-06-18 08:08:08 +02:00

intern

Ghost: Fix offline OGL render on windows.

2018-06-18 18:10:45 -06:00

release

Cleanup: rename mode -> object.mode in Py UI

2018-06-19 09:25:05 +02:00

source

Merge branch 'master' into blender2.8

2018-06-19 10:52:01 +02:00

tests

Use evaluated objects in Alembic unit tests

2018-06-12 15:39:54 +02:00

.arcconfig

Arc: Use proper lacding branch

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

.editorconfig

editorconfig: correct C/C++ using space

2018-06-19 07:48:12 +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-17 20:37:10 +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

Cleanup: trailing space cmake, make.bat

2018-06-17 20:18:09 +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%