Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2018 10:38:54 +0000 (12:38 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2018 10:38:54 +0000 (12:38 +0200)
commitc98b2e74df2e531726f5ceabe76342282f695f23
treeb1ce1ce48658847da18ee13550583e661b194ec6
parentfdd26faa49f056702b63a3b60d0da051c3f77c68
parent5508b572ea9bb2d3b758cae6898035005e8ebb2a
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
12 files changed:
intern/cycles/device/device_cuda.cpp
source/blender/blenkernel/BKE_animsys.h
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/nla.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/armature/armature_relations.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/render/intern/source/pipeline.c