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

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

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

..

blender

Merge branch 'master' into blender2.8

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

blenderplayer/bad_level_call_stubs

Merge branch 'master' into blender2.8

2018-08-31 13:40:10 +10:00

creator

Cleanup: comment blocks

2018-09-02 18:51:31 +10:00

tools @ 11656ebaf7

GP: Replace custom function by standard API

2018-08-27 23:16:02 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

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