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

[Sergey Sharybin]

Commit: fc9624e485e17fa43e21931b1e5f2b5ec5211ab2
Author: Sergey Sharybin
Date:   Mon Apr 23 16:44:09 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBfc9624e485e17fa43e21931b1e5f2b5ec5211ab2

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations.h
index ed2d4b1162f,4a8e91f18db..7469540521b
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@@ -176,27 -174,26 +177,27 @@@ struct DepsgraphRelationBuilde
  	void begin_build();
  
  	template <typename KeyFrom, typename KeyTo>
- 	void add_relation(const KeyFrom& key_from,
- 	                  const KeyTo& key_to,
- 	                  const char *description,
- 	                  bool check_unique = false);
+ 	DepsRelation *add_relation(const KeyFrom& key_from,
+ 	                           const KeyTo& key_to,
+ 	                           const char *description,
+ 	                           bool check_unique = false);
  
  	template <typename KeyTo>
- 	void add_relation(const TimeSourceKey& key_from,
- 	                  const KeyTo& key_to,
- 	                  const char *description,
- 	                  bool check_unique = false);
+ 	DepsRelation *add_relation(const TimeSourceKey& key_from,
+ 	                           const KeyTo& key_to,
+ 	                           const char *description,
+ 	                           bool check_unique = false);
  
  	template <typename KeyType>
- 	void add_node_handle_relation(const KeyType& key_from,
- 	                              const DepsNodeHandle *handle,
- 	                              const char *description,
- 	                              bool check_unique = false);
+ 	DepsRelation *add_node_handle_relation(const KeyType& key_from,
+ 	                                       const DepsNodeHandle *handle,
+ 	                                       const char *description,
+ 	                                       bool check_unique = false);
  
 -	void build_scene(Scene *scene);
 +	void build_view_layer(Scene *scene, ViewLayer *view_layer);
  	void build_group(Object *object, Group *group);
 -	void build_object(Object *object);
 +	void build_object(Base *base, Object *object);
 +	void build_object_flags(Base *base, Object *object);
  	void build_object_data(Object *object);
  	void build_object_parent(Object *object);
  	void build_constraints(ID *id,