Germano 790025c01e Merge branch 'master' into blender2.8 ... # Conflicts: # intern/cycles/blender/blender_mesh.cpp # source/blender/editors/screen/screen_ops.c # source/blender/editors/space_view3d/drawobject.c		2018-01-21 18:45:47 -02:00
..
blender	Merge branch 'master' into blender2.8	2018-01-21 18:45:47 -02: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	…