[Bf-blender-cvs] [11af9e9] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 11af9e9a5bd1caff1ec46794bda2934a01ce5035
Author: Bastien Montagne
Date:   Wed Jun 1 14:34:11 2016 +0200
Branches: blender2.8
https://developer.blender.org/rB11af9e9a5bd1caff1ec46794bda2934a01ce5035

Merge branch 'master' into blender2.8

Conflicts:
	intern/cycles/blender/blender_curves.cpp
	intern/cycles/blender/blender_particles.cpp
	source/blender/depsgraph/intern/builder/deg_builder_relations.h
	source/blender/depsgraph/intern/depsgraph_build.cc

===================================================================



===================================================================