[Bf-blender-cvs] [4a7faaa3999] master: Cleanup: reformatted after NULL -> nullptr in depsgraph C++ code
Sybren A. Stüvel
noreply at git.blender.org
Tue Jan 28 16:18:07 CET 2020
Commit: 4a7faaa3999a32efd974af087348389ecdb2cf60
Author: Sybren A. Stüvel
Date: Tue Jan 28 16:16:45 2020 +0100
Branches: master
https://developer.blender.org/rB4a7faaa3999a32efd974af087348389ecdb2cf60
Cleanup: reformatted after NULL -> nullptr in depsgraph C++ code
No functional changes.
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
===================================================================
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;
}
More information about the Bf-blender-cvs
mailing list