blender
/
blender
131
398
Fork 577
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Cleanup: reformatted after NULL -> nullptr in depsgraph C++ code 

No functional changes.
This commit is contained in:
Sybren A. Stüvel 2020-01-28 16:16:45 +01:00
parent 38f3a85649
commit 4a7faaa399
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@ -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) {

3
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
View File

@ -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;
}