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

Conflicts:
	source/blender/blenkernel/BKE_global.h
	source/blender/editors/undo/ed_undo.c

2018-10-17 16:50:36 +02:00

build_files

Fix cmake not triggering rebuild on .glsl changes

2018-10-17 11:24:33 +11:00

doc

Python API: add loop triangles access, remove tessfaces.

2018-10-10 17:43:44 +02:00

extern

Merge branch 'master' into blender2.8

2018-09-12 15:54:07 +10:00

intern

UI: tweak and fixes for cycles sampling panel, remove unneeded decorators.

2018-10-16 17:14:49 +02:00

release

UI: particle deflector options in topbar

2018-10-17 18:56:21 +11:00

source

Merge branch 'master' into blender2.8

2018-10-17 16:50:36 +02:00

tests

Merge branch 'master' into blender2.8

2018-10-09 08:46:00 +11: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

CMake: Default to C11 for Clang and GCC

2018-09-28 10:09:46 +02:00

COPYING

== docs ==

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

GNUmakefile

Build: allow overriding DEPS_BUILD_DIR and DEPS_INSTALL_DIR for make deps.

2018-09-24 15:48:50 +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%