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

Conflicts:
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/editors/object/object_add.c
	source/blender/python/intern/bpy_app_handlers.c

2017-08-08 16:43:25 +02:00

..

blender

Merge branch 'master' into blender2.8

2017-08-08 16:43:25 +02:00

blenderplayer

Fix manipulator Python API crash w/ undo

2017-07-31 06:45:05 +10:00

creator

Main Workspace Integration

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

gameengine

Cleanup: warnings

2017-08-01 17:24:30 +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