diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-01-28 18:16:45 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-01-28 18:17:21 +0300 |
| commit | 4a7faaa3999a32efd974af087348389ecdb2cf60 (patch) | |
| tree | 5179c4d805bd976e4a09b2dd3ca912938194ef1f /source/blender/depsgraph | |
| parent | 38f3a85649088119436a89161fadf7e217b8b040 (diff) | |
Cleanup: reformatted after NULL -> nullptr in depsgraph C++ code
No functional changes.
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 8 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 0b3e6aedac0..8ff99816908 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -309,7 +309,8 @@ void DepsgraphRelationBuilder::add_modifier_to_transform_relation(const DepsNode void DepsgraphRelationBuilder::add_customdata_mask(Object *object, const DEGCustomDataMeshMasks &customdata_masks) { - if (customdata_masks != DEGCustomDataMeshMasks() && object != nullptr && object->type == OB_MESH) { + if (customdata_masks != DEGCustomDataMeshMasks() && object != nullptr && + object->type == OB_MESH) { DEG::IDNode *id_node = graph_->find_id_node(&object->id); if (id_node == nullptr) { @@ -562,8 +563,9 @@ void DepsgraphRelationBuilder::build_collection(LayerCollection *from_layer_coll return; } const bool group_done = built_map_.checkIsBuiltAndTag(collection); - OperationKey object_transform_final_key( - object != nullptr ? &object->id : nullptr, NodeType::TRANSFORM, OperationCode::TRANSFORM_FINAL); + OperationKey object_transform_final_key(object != nullptr ? &object->id : nullptr, + NodeType::TRANSFORM, + OperationCode::TRANSFORM_FINAL); ComponentKey duplicator_key(object != nullptr ? &object->id : nullptr, NodeType::DUPLI); if (!group_done) { LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) { diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index 18e1dec8bc1..b74e5715e14 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -1086,7 +1086,8 @@ bool deg_validate_copy_on_write_datablock(ID *id_cow) } ValidateData data; data.is_valid = true; - BKE_library_foreach_ID_link(nullptr, id_cow, foreach_libblock_validate_callback, &data, IDWALK_NOP); + BKE_library_foreach_ID_link( + nullptr, id_cow, foreach_libblock_validate_callback, &data, IDWALK_NOP); return data.is_valid; } |