diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-08 19:38:42 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-09 12:33:44 +0300 |
commit | 70e34ac186ebe86422a89fdccf8d20907743e503 (patch) | |
tree | a6aafc2ba9ab2d41281d2bee319e2ca318b911f9 /source | |
parent | 9f0842bbe8ea6b78621a140ec18125cb8ded4dcf (diff) |
Depsgraph: Cleanup, use google style for private members
Diffstat (limited to 'source')
5 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 166df70d8d7..98d2e8893c1 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -153,8 +153,8 @@ void constraint_walk(bConstraint * /*con*/, /* **** General purpose functions **** */ DepsgraphNodeBuilder::DepsgraphNodeBuilder(Main *bmain, Depsgraph *graph) : - m_bmain(bmain), - m_graph(graph) + bmain_(bmain), + graph_(graph) { } @@ -164,12 +164,12 @@ DepsgraphNodeBuilder::~DepsgraphNodeBuilder() IDDepsNode *DepsgraphNodeBuilder::add_id_node(ID *id) { - return m_graph->add_id_node(id, id->name); + return graph_->add_id_node(id, id->name); } TimeSourceDepsNode *DepsgraphNodeBuilder::add_time_source() { - return m_graph->add_time_source(); + return graph_->add_time_source(); } ComponentDepsNode *DepsgraphNodeBuilder::add_component_node( @@ -195,7 +195,7 @@ OperationDepsNode *DepsgraphNodeBuilder::add_operation_node( name_tag); if (op_node == NULL) { op_node = comp_node->add_operation(op, opcode, name, name_tag); - m_graph->operations.push_back(op_node); + graph_->operations.push_back(op_node); } else { fprintf(stderr, @@ -315,7 +315,7 @@ void DepsgraphNodeBuilder::build_object(Scene *scene, Base *base, Object *ob) { const bool has_object = (ob->id.tag & LIB_TAG_DOIT); IDDepsNode *id_node = (has_object) - ? m_graph->find_id_node(&ob->id) + ? graph_->find_id_node(&ob->id) : add_id_node(&ob->id); /* Update node layers. * Do it for both new and existing ID nodes. This is so because several diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h index a54b1c76c77..2c698b3335d 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h @@ -156,8 +156,8 @@ struct DepsgraphNodeBuilder { void build_movieclip(MovieClip *clip); protected: - Main *m_bmain; - Depsgraph *m_graph; + Main *bmain_; + Depsgraph *graph_; }; } // namespace DEG diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index d673a05552f..bd6be70a831 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -194,7 +194,7 @@ RNAPathKey::RNAPathKey(ID *id, const char *path) : } DepsgraphRelationBuilder::DepsgraphRelationBuilder(Depsgraph *graph) : - m_graph(graph) + graph_(graph) { } @@ -206,14 +206,14 @@ TimeSourceDepsNode *DepsgraphRelationBuilder::find_node( return NULL; } else { - return m_graph->time_source; + return graph_->time_source; } } ComponentDepsNode *DepsgraphRelationBuilder::find_node( const ComponentKey &key) const { - IDDepsNode *id_node = m_graph->find_id_node(key.id); + IDDepsNode *id_node = graph_->find_id_node(key.id); if (!id_node) { fprintf(stderr, "find_node component: Could not find ID %s\n", (key.id != NULL) ? key.id->name : "<null>"); @@ -227,7 +227,7 @@ ComponentDepsNode *DepsgraphRelationBuilder::find_node( OperationDepsNode *DepsgraphRelationBuilder::find_node( const OperationKey &key) const { - IDDepsNode *id_node = m_graph->find_id_node(key.id); + IDDepsNode *id_node = graph_->find_id_node(key.id); if (!id_node) { fprintf(stderr, "find_node operation: Could not find ID\n"); return NULL; @@ -252,13 +252,13 @@ OperationDepsNode *DepsgraphRelationBuilder::find_node( DepsNode *DepsgraphRelationBuilder::find_node(const RNAPathKey &key) const { - return m_graph->find_node_from_pointer(&key.ptr, key.prop); + return graph_->find_node_from_pointer(&key.ptr, key.prop); } OperationDepsNode *DepsgraphRelationBuilder::has_node( const OperationKey &key) const { - IDDepsNode *id_node = m_graph->find_id_node(key.id); + IDDepsNode *id_node = graph_->find_id_node(key.id); if (!id_node) { return NULL; } @@ -275,7 +275,7 @@ void DepsgraphRelationBuilder::add_time_relation(TimeSourceDepsNode *timesrc, const char *description) { if (timesrc && node_to) { - m_graph->add_new_relation(timesrc, node_to, description); + graph_->add_new_relation(timesrc, node_to, description); } else { DEG_DEBUG_PRINTF("add_time_relation(%p = %s, %p = %s, %s) Failed\n", @@ -291,7 +291,7 @@ void DepsgraphRelationBuilder::add_operation_relation( const char *description) { if (node_from && node_to) { - m_graph->add_new_relation(node_from, node_to, description); + graph_->add_new_relation(node_from, node_to, description); } else { DEG_DEBUG_PRINTF("add_operation_relation(%p = %s, %p = %s, %s) Failed\n", @@ -366,7 +366,7 @@ void DepsgraphRelationBuilder::add_forcefield_relations(const OperationKey &key, Depsgraph *DepsgraphRelationBuilder::getGraph() { - return m_graph; + return graph_; } /* **** Functions to build relations between entities **** */ @@ -1019,7 +1019,7 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu) /* Drivers on armature-level bone settings (i.e. bbone stuff), * which will affect the evaluation of corresponding pose bones. */ - IDDepsNode *arm_node = m_graph->find_id_node(id); + IDDepsNode *arm_node = graph_->find_id_node(id); char *bone_name = BLI_str_quoted_substrN(rna_path, "bones["); if (arm_node && bone_name) { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h index 02f8fc69070..da0d4b9f96b 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h @@ -252,7 +252,7 @@ protected: bool needs_animdata_node(ID *id); private: - Depsgraph *m_graph; + Depsgraph *graph_; }; struct DepsNodeHandle diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc index 6a9568e7e8d..318534d0b43 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc @@ -114,8 +114,8 @@ void DepsgraphRelationBuilder::build_scene(Main *bmain, Scene *scene) build_movieclip(clip); } - for (Depsgraph::OperationNodes::const_iterator it_op = m_graph->operations.begin(); - it_op != m_graph->operations.end(); + for (Depsgraph::OperationNodes::const_iterator it_op = graph_->operations.begin(); + it_op != graph_->operations.end(); ++it_op) { OperationDepsNode *node = *it_op; |