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

Conflicts:
	source/blender/editors/space_view3d/drawobject.c

2017-07-05 09:20:48 +02:00

..

blender

Merge branch 'master' into blender2.8

2017-07-05 09:20:48 +02:00

blenderplayer

Manipulator: Python API

2017-06-26 16:38:04 +10:00

creator

Main Workspace Integration

2017-06-01 19:59:37 +02:00

gameengine

Merge branch 'master' into blender2.8

2017-06-19 15:06:48 +10:00

tools @ b11375e890

Fix blurry icons

2017-01-29 17:21:57 +03:00

CMakeLists.txt

Fix WITH_LEGACY_OPENGL=ON

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