Bastien Montagne 47fa3e7b27 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/BLO_readfile.h
	source/blender/blenloader/intern/readfile.c
	source/blender/windowmanager/intern/wm_files_link.c

2017-12-04 14:07:39 +01:00

..

blender

Merge branch 'master' into blender2.8

2017-12-04 14:07:39 +01:00

blenderplayer

Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer

2017-11-23 14:58:01 -02:00

creator

Cleanup: whitespace

2017-12-04 17:20:26 +11:00

gameengine

Groups and collection: initial integration

2017-12-01 14:15:54 -02:00

tools @ 9ea62ef860

Fix (unreported) Crash: broken RNA accessors to tesselated MCol data.

2017-11-20 10:16:50 +01:00

CMakeLists.txt

Fix WITH_LEGACY_OPENGL=ON

2017-04-08 12:01:29 +10:00