Bastien Montagne 91af8f2ae2 Merge branch 'master' into blender2.8 ...

Conflicts:
	intern/cycles/device/device.cpp
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/material.c
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/space_outliner/outliner_draw.c
	source/blender/editors/space_outliner/outliner_edit.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/util/ed_util.c
	source/blender/windowmanager/intern/wm_files_link.c

2017-11-06 18:02:46 +01:00

..

blender

Merge branch 'master' into blender2.8

2017-11-06 18:02:46 +01:00

blenderplayer

Merge branch 'master' into blender2.8

2017-11-03 20:59:15 +11:00

creator

Merge branch 'master' into blender2.8

2017-10-20 00:29:04 +11:00

gameengine

Workspace: Move engines to workspace and Properties Editor cleanup

2017-10-16 17:29:04 -02: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