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

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

2018-01-11 20:19:18 +01:00

..

blender

Merge branch 'master' into blender2.8

2018-01-11 20:19:18 +01:00

blenderplayer

Merge branch 'master' into blender2.8

2018-01-04 00:09:10 +11: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 @ ccf20e0870

Fix T53474, bevel glitchy with big objects.

2017-12-18 12:24:42 -05:00

CMakeLists.txt

Fix WITH_LEGACY_OPENGL=ON

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