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

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

2018-09-03 17:44:36 +02:00

..

bmesh

Merge branch 'master' into blender2.8

2018-09-03 17:44:36 +02:00

generic

Merge branch 'master' into blender2.8

2018-09-03 12:48:51 +10:00

gpu

Cleanup: style

2018-07-19 16:06:37 +10:00

intern

Merge branch 'master' into blender2.8

2018-09-03 17:44:36 +02:00

mathutils

Merge branch 'master' into blender2.8

2018-09-03 17:44:36 +02:00

BPY_extern_clog.h

Logging: use for Python API

2018-04-02 13:13:57 +02:00

BPY_extern.h

Merge branch 'master' into blender2.8

2018-09-03 12:48:51 +10:00

CMakeLists.txt

GWN: Port to GPU module: Replace GWN prefix by GPU

2018-07-18 11:49:15 +02:00

rna_dump.py

Cleanup: pep8

2018-07-03 06:55:02 +02:00

simple_enum_gen.py

Merge branch 'master' into blender2.8

2018-07-07 08:53:00 +02:00