This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.

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

Conflicts:
	source/blender/collada/MeshImporter.cpp
	source/blender/editors/object/object_add.c
	source/blender/editors/screen/screen_edit.c

2017-06-15 15:54:11 +02:00

..

blender

Merge branch 'master' into blender2.8

2017-06-15 15:54:11 +02:00

blenderplayer

Updates to manipulator API

2017-06-15 20:56:22 +10:00

creator

Main Workspace Integration

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

gameengine

Merge branch 'master' into blender2.8

2017-06-02 15:39:29 +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