Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 23 Apr 2018 14:44:09 +0000 (16:44 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 23 Apr 2018 14:44:09 +0000 (16:44 +0200)
1  2 
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
source/blender/depsgraph/intern/depsgraph.h
source/blender/depsgraph/intern/eval/deg_eval_flush.cc

index ed2d4b1162f859fa2fbbc30f6b8235067281231d,4a8e91f18dbeba9aecfd4d3a0ade93c1102b9e02..7469540521b83f7f93afb25fb40616b8cc46beff
@@@ -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,