Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-11-08 19:43:53 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-09 12:33:44 +0300
commit887c2e5c0dead416c40fd6a0524a3da579aa24ae (patch)
tree79826bcf1c378dd81f19ee601cb928efed0c5c7c /source/blender/depsgraph/intern/builder/deg_builder_relations.h
parent70e34ac186ebe86422a89fdccf8d20907743e503 (diff)
Depsgraph: Make bmain part of builder state and remove bmain from public API
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_relations.h')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index da0d4b9f96b..4b1c6fd5562 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -165,9 +165,9 @@ struct RNAPathKey
struct DepsgraphRelationBuilder
{
- DepsgraphRelationBuilder(Depsgraph *graph);
+ DepsgraphRelationBuilder(Main *bmain, Depsgraph *graph);
- void begin_build(Main *bmain);
+ void begin_build();
template <typename KeyFrom, typename KeyTo>
void add_relation(const KeyFrom& key_from,
@@ -184,7 +184,7 @@ struct DepsgraphRelationBuilder
const DepsNodeHandle *handle,
const char *description);
- void build_scene(Main *bmain, Scene *scene);
+ void build_scene(Scene *scene);
void build_group(Main *bmain, Scene *scene, Object *object, Group *group);
void build_object(Main *bmain, Scene *scene, Object *ob);
void build_object_parent(Object *ob);
@@ -252,6 +252,7 @@ protected:
bool needs_animdata_node(ID *id);
private:
+ Main *bmain_;
Depsgraph *graph_;
};