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 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

..

extern/include

Merge branch 'master' into blender2.8

2017-10-31 17:38:53 +01:00

intern

Merge branch 'master' into blender2.8

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

CMakeLists.txt

Merge branch 'master' into blender2.8

2017-09-25 18:57:43 +05:00