diff options
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_relations.h')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h index 86227f4aaf8..68762043e5e 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h @@ -186,8 +186,9 @@ struct DepsgraphRelationBuilder void build_scene(Scene *scene); void build_group(Object *object, Group *group); - void build_object(Object *ob); - void build_object_parent(Object *ob); + void build_object(Object *object); + void build_object_data(Object *object); + void build_object_parent(Object *object); void build_constraints(ID *id, eDepsNode_Type component_type, const char *component_subdata, @@ -197,22 +198,22 @@ struct DepsgraphRelationBuilder void build_driver(ID *id, FCurve *fcurve); void build_world(World *world); void build_rigidbody(Scene *scene); - void build_particles(Object *ob); + void build_particles(Object *object); void build_cloth(Object *object, ModifierData *md); - void build_ik_pose(Object *ob, + void build_ik_pose(Object *object, bPoseChannel *pchan, bConstraint *con, RootPChanMap *root_map); - void build_splineik_pose(Object *ob, + void build_splineik_pose(Object *object, bPoseChannel *pchan, bConstraint *con, RootPChanMap *root_map); - void build_rig(Object *ob); - void build_proxy_rig(Object *ob); + void build_rig(Object *object); + void build_proxy_rig(Object *object); void build_shapekeys(ID *obdata, Key *key); - void build_obdata_geom(Object *ob); - void build_camera(Object *ob); - void build_lamp(Object *ob); + void build_obdata_geom(Object *object); + void build_camera(Object *object); + void build_lamp(Object *object); void build_nodetree(bNodeTree *ntree); void build_material(Material *ma); void build_texture(Tex *tex); @@ -225,14 +226,14 @@ struct DepsgraphRelationBuilder void add_collision_relations(const OperationKey &key, Scene *scene, - Object *ob, + Object *object, Group *group, int layer, bool dupli, const char *name); void add_forcefield_relations(const OperationKey &key, Scene *scene, - Object *ob, + Object *object, ParticleSystem *psys, EffectorWeights *eff, bool add_absorption, @@ -244,11 +245,13 @@ struct DepsgraphRelationBuilder Depsgraph *getGraph(); protected: - TimeSourceDepsNode *find_node(const TimeSourceKey &key) const; - ComponentDepsNode *find_node(const ComponentKey &key) const; + TimeSourceDepsNode *get_node(const TimeSourceKey &key) const; + ComponentDepsNode *get_node(const ComponentKey &key) const; + OperationDepsNode *get_node(const OperationKey &key) const; + DepsNode *get_node(const RNAPathKey &key) const; + OperationDepsNode *find_node(const OperationKey &key) const; - DepsNode *find_node(const RNAPathKey &key) const; - OperationDepsNode *has_node(const OperationKey &key) const; + bool has_node(const OperationKey &key) const; void add_time_relation(TimeSourceDepsNode *timesrc, DepsNode *node_to, @@ -292,7 +295,7 @@ struct DepsNodeHandle template <typename KeyType> OperationDepsNode *DepsgraphRelationBuilder::find_operation_node(const KeyType& key) { - DepsNode *node = find_node(key); + DepsNode *node = get_node(key); return node != NULL ? node->get_exit_operation() : NULL; } @@ -301,8 +304,8 @@ void DepsgraphRelationBuilder::add_relation(const KeyFrom &key_from, const KeyTo &key_to, const char *description) { - DepsNode *node_from = find_node(key_from); - DepsNode *node_to = find_node(key_to); + DepsNode *node_from = get_node(key_from); + DepsNode *node_to = get_node(key_to); OperationDepsNode *op_from = node_from ? node_from->get_exit_operation() : NULL; OperationDepsNode *op_to = node_to ? node_to->get_entry_operation() : NULL; if (op_from && op_to) { @@ -311,7 +314,6 @@ void DepsgraphRelationBuilder::add_relation(const KeyFrom &key_from, else { if (!op_from) { /* XXX TODO handle as error or report if needed */ - node_from = find_node(key_from); fprintf(stderr, "add_relation(%s) - Could not find op_from (%s)\n", description, key_from.identifier().c_str()); } @@ -336,14 +338,12 @@ void DepsgraphRelationBuilder::add_relation(const TimeSourceKey &key_from, const KeyTo &key_to, const char *description) { - TimeSourceDepsNode *time_from = find_node(key_from); - DepsNode *node_to = find_node(key_to); + TimeSourceDepsNode *time_from = get_node(key_from); + DepsNode *node_to = get_node(key_to); OperationDepsNode *op_to = node_to ? node_to->get_entry_operation() : NULL; - if (time_from && op_to) { + if (time_from != NULL && op_to != NULL) { add_time_relation(time_from, op_to, description); } - else { - } } template <typename KeyType> @@ -352,10 +352,10 @@ void DepsgraphRelationBuilder::add_node_handle_relation( const DepsNodeHandle *handle, const char *description) { - DepsNode *node_from = find_node(key_from); + DepsNode *node_from = get_node(key_from); OperationDepsNode *op_from = node_from ? node_from->get_exit_operation() : NULL; OperationDepsNode *op_to = handle->node->get_entry_operation(); - if (op_from && op_to) { + if (op_from != NULL && op_to != NULL) { add_operation_relation(op_from, op_to, description); } else { @@ -375,7 +375,7 @@ DepsNodeHandle DepsgraphRelationBuilder::create_node_handle( const KeyType &key, const char *default_name) { - return DepsNodeHandle(this, find_node(key), default_name); + return DepsNodeHandle(this, get_node(key), default_name); } } // namespace DEG |