Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 10 Aug 2016 13:06:40 +0000 (15:06 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 10 Aug 2016 13:06:40 +0000 (15:06 +0200)
commit8fd4a8ab5db10757801a6aadc03f8248bcad73ed
treefa78c024f3e139752d24fd2c1ad9abb9349ce3fa
parente7a32365cf9b43b97b1b1f8cd76e9834c9e4037a
parent774beb7c3cf04cc42703a4a6ebb9a4836690b060
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/particle.c
15 files changed:
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_object.cpp
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/library.c
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c