From 35b78d9807c49ba37e038eda85c672c72dee0247 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 15 Mar 2019 08:53:22 +1100 Subject: Cleanup: indentation, wrapping Mostly functions wrapping args, not confirming to our style guide. --- .../depsgraph/intern/builder/deg_builder_nodes.cc | 3 +- .../intern/builder/deg_builder_relations.cc | 41 +++++++++++++--------- 2 files changed, 26 insertions(+), 18 deletions(-) (limited to 'source/blender/depsgraph') diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index eefdb809f37..ecb2dad292a 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -497,7 +497,8 @@ void DepsgraphNodeBuilder::build_collection( * might become visible too. */ } else if (from_layer_collection == NULL && - !id_node->is_collection_fully_expanded) { + !id_node->is_collection_fully_expanded) + { /* Initially collection was built from layer now, and was requested * to not recurs into object. But nw it's asked to recurs into all * objects. */ diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 2e78df7584a..ef5ec6a9949 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -2269,30 +2269,37 @@ void DepsgraphRelationBuilder::build_object_data_geometry_datablock(ID *obdata) { Curve *cu = (Curve *)obdata; if (cu->bevobj != NULL) { - ComponentKey bevob_geom_key(&cu->bevobj->id, - NodeType::GEOMETRY); - add_relation(bevob_geom_key, - obdata_geom_eval_key, - "Curve Bevel Geometry"); - ComponentKey bevob_key(&cu->bevobj->id, - NodeType::TRANSFORM); - add_relation(bevob_key, - obdata_geom_eval_key, - "Curve Bevel Transform"); + ComponentKey bevob_geom_key( + &cu->bevobj->id, + NodeType::GEOMETRY); + add_relation( + bevob_geom_key, + obdata_geom_eval_key, + "Curve Bevel Geometry"); + ComponentKey bevob_key( + &cu->bevobj->id, + NodeType::TRANSFORM); + add_relation( + bevob_key, + obdata_geom_eval_key, + "Curve Bevel Transform"); build_object(NULL, cu->bevobj); } if (cu->taperobj != NULL) { - ComponentKey taperob_key(&cu->taperobj->id, - NodeType::GEOMETRY); + ComponentKey taperob_key( + &cu->taperobj->id, + NodeType::GEOMETRY); add_relation(taperob_key, obdata_geom_eval_key, "Curve Taper"); build_object(NULL, cu->taperobj); } if (cu->textoncurve != NULL) { - ComponentKey textoncurve_key(&cu->textoncurve->id, - NodeType::GEOMETRY); - add_relation(textoncurve_key, - obdata_geom_eval_key, - "Text on Curve"); + ComponentKey textoncurve_key( + &cu->textoncurve->id, + NodeType::GEOMETRY); + add_relation( + textoncurve_key, + obdata_geom_eval_key, + "Text on Curve"); build_object(NULL, cu->textoncurve); } break; -- cgit v1.2.3