Bastien Montagne 168a6a4bfc Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/makesrna/intern/rna_dynamicpaint.c

2018-12-09 21:51:23 +01:00

build_files

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

2018-12-05 08:46:12 -07:00

doc

Docs: rename group -> collection

2018-11-30 09:10:40 +11:00

extern

Merge branch 'master' into blender2.8

2018-12-04 16:35:16 +01:00

intern

Merge branch 'master' into blender2.8

2018-12-07 15:00:48 +01:00

release

User Interface: Add button color for indicating that the value differs from the interpolated one

2018-12-08 18:06:23 +01:00

source

Merge branch 'master' into blender2.8

2018-12-09 21:51:23 +01:00

tests

Fix T58556: Some remaining 'dupli_types' in pycode after renaming.

2018-12-03 10:39:54 +01: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

Point addons contrib to 2.8 branch

2018-10-23 09:41:12 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-12-04 16:35:16 +01:00

COPYING

== docs ==

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

GNUmakefile

Fix "make update" on macOS/Linux not updating addons to the blender2.8 branch.

2018-10-30 14:43:09 +01: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%