Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 31 May 2018 14:21:47 +0000 (16:21 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 31 May 2018 14:21:47 +0000 (16:21 +0200)
commiteb1feb9f4a62e3caca4b72964c9fdd8187df53e5
tree2c6b18ee72db4a386bf68425cc40620f9d49c48f
parent0b396bc15bd4433bfe9b8c6ffbc87d312d2426c1
parent16100f8261770e367b0892bb38c778699ed609fe
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/object/object_add.c
source/blender/editors/object/object_select.c
source/blender/editors/space_outliner/outliner_edit.c
18 files changed:
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/bpath.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_select.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_node/node_add.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/makesrna/intern/rna_ID.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_toolsystem.c
source/creator/creator_args.c