diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-01-28 16:50:13 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-01-28 17:10:44 +0300 |
commit | 40a9b5ebc77953a3f0b47def39438beed681aac0 (patch) | |
tree | 7c59d584e43ea837a40e064a73859909f08ca84b /source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h | |
parent | 01a348274218103ecdbaddc699a97e86f0c4ce18 (diff) |
Cleanup: changed NULL to nullptr in depsgraph C++ code
No functional changes.
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h b/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h index 4412fa3fca3..eeeb58100b0 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h @@ -36,7 +36,7 @@ template<typename KeyType> OperationNode *DepsgraphRelationBuilder::find_operation_node(const KeyType &key) { Node *node = get_node(key); - return node != NULL ? node->get_exit_operation() : NULL; + return node != nullptr ? node->get_exit_operation() : nullptr; } template<typename KeyFrom, typename KeyTo> @@ -47,8 +47,8 @@ Relation *DepsgraphRelationBuilder::add_relation(const KeyFrom &key_from, { Node *node_from = get_node(key_from); Node *node_to = get_node(key_to); - OperationNode *op_from = node_from ? node_from->get_exit_operation() : NULL; - OperationNode *op_to = node_to ? node_to->get_entry_operation() : NULL; + OperationNode *op_from = node_from ? node_from->get_exit_operation() : nullptr; + OperationNode *op_to = node_to ? node_to->get_entry_operation() : nullptr; if (op_from && op_to) { return add_operation_relation(op_from, op_to, description, flags); } @@ -80,7 +80,7 @@ Relation *DepsgraphRelationBuilder::add_relation(const KeyFrom &key_from, key_to.identifier().c_str()); } } - return NULL; + return nullptr; } template<typename KeyTo> @@ -91,11 +91,11 @@ Relation *DepsgraphRelationBuilder::add_relation(const TimeSourceKey &key_from, { TimeSourceNode *time_from = get_node(key_from); Node *node_to = get_node(key_to); - OperationNode *op_to = node_to ? node_to->get_entry_operation() : NULL; - if (time_from != NULL && op_to != NULL) { + OperationNode *op_to = node_to ? node_to->get_entry_operation() : nullptr; + if (time_from != nullptr && op_to != nullptr) { return add_time_relation(time_from, op_to, description, flags); } - return NULL; + return nullptr; } template<typename KeyType> @@ -105,9 +105,9 @@ Relation *DepsgraphRelationBuilder::add_node_handle_relation(const KeyType &key_ int flags) { Node *node_from = get_node(key_from); - OperationNode *op_from = node_from ? node_from->get_exit_operation() : NULL; + OperationNode *op_from = node_from ? node_from->get_exit_operation() : nullptr; OperationNode *op_to = handle->node->get_entry_operation(); - if (op_from != NULL && op_to != NULL) { + if (op_from != nullptr && op_to != nullptr) { return add_operation_relation(op_from, op_to, description, flags); } else { @@ -124,7 +124,7 @@ Relation *DepsgraphRelationBuilder::add_node_handle_relation(const KeyType &key_ key_from.identifier().c_str()); } } - return NULL; + return nullptr; } template<typename KeyTo> @@ -135,7 +135,7 @@ Relation *DepsgraphRelationBuilder::add_depends_on_transform_relation(ID *id, { if (GS(id->name) == ID_OB) { Object *object = reinterpret_cast<Object *>(id); - if (object->rigidbody_object != NULL) { + if (object->rigidbody_object != nullptr) { OperationKey transform_key(&object->id, NodeType::TRANSFORM, OperationCode::TRANSFORM_EVAL); return add_relation(transform_key, key_to, description, flags); } @@ -162,12 +162,12 @@ bool DepsgraphRelationBuilder::is_same_bone_dependency(const KeyFrom &key_from, /* Get operations for requested keys. */ Node *node_from = get_node(key_from); Node *node_to = get_node(key_to); - if (node_from == NULL || node_to == NULL) { + if (node_from == nullptr || node_to == nullptr) { return false; } OperationNode *op_from = node_from->get_exit_operation(); OperationNode *op_to = node_to->get_entry_operation(); - if (op_from == NULL || op_to == NULL) { + if (op_from == nullptr || op_to == nullptr) { return false; } /* Different armatures, bone can't be the same. */ @@ -193,12 +193,12 @@ bool DepsgraphRelationBuilder::is_same_nodetree_node_dependency(const KeyFrom &k /* Get operations for requested keys. */ Node *node_from = get_node(key_from); Node *node_to = get_node(key_to); - if (node_from == NULL || node_to == NULL) { + if (node_from == nullptr || node_to == nullptr) { return false; } OperationNode *op_from = node_from->get_exit_operation(); OperationNode *op_to = node_to->get_entry_operation(); - if (op_from == NULL || op_to == NULL) { + if (op_from == nullptr || op_to == nullptr) { return false; } /* Check if this is actually a node tree. */ |