Bastien Montagne 9c0dea213e Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/rigidbody.c

2018-07-25 21:12:04 +02:00

build_files

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

2018-07-22 16:03:46 -06:00

doc

Gizmo: update Python templates

2018-07-15 19:51:11 +02:00

extern

Merge branch 'master' into blender2.8

2018-06-29 09:25:40 +02:00

intern

Merge branch 'master' into blender2.8

2018-07-25 21:12:04 +02:00

release

Merge branch 'master' into blender2.8

2018-07-25 21:12:04 +02:00

source

Merge branch 'master' into blender2.8

2018-07-25 21:12:04 +02:00

tests

UI/Python: rename Lamps to Lights, to follow more standard terminology.

2018-07-06 20:06:09 +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-07-23 14:23:21 +02:00

COPYING

== docs ==

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

GNUmakefile

Merge branch 'master' into blender2.8

2018-07-13 18:20:10 +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%