diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-25 13:02:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-25 13:06:51 +0300 |
| commit | 29c106924408a508b2f37af9e09d9eb46adc6fad (patch) | |
| tree | 1858cfeb59d259a434da39848ee130ae8aa63627 /source/blender/depsgraph | |
| parent | 7a4d5b78ea061196f7bf1550928680e9f094e38b (diff) | |
Cleanup: code style
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 7 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph.cc | 2 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_physics.cc | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 524933a5f37..cfb2f1bc8d6 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -463,9 +463,10 @@ void DepsgraphNodeBuilder::build_collection( /* Build collection objects. */ LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) { if (allow_restrict_flags) { - const int restrict_flag = (graph_->mode == DAG_EVAL_VIEWPORT) - ? OB_RESTRICT_VIEW - : OB_RESTRICT_RENDER; + const int restrict_flag = ( + (graph_->mode == DAG_EVAL_VIEWPORT) ? + OB_RESTRICT_VIEW : + OB_RESTRICT_RENDER); if (cob->ob->restrictflag & restrict_flag) { continue; } diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 5b7cf3d5a16..bb340492a63 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -94,7 +94,7 @@ Depsgraph::Depsgraph(Scene *scene, ctime(BKE_scene_frame_get(scene)), scene_cow(NULL), is_active(false), - effector_relations(NULL) + effector_relations(NULL) { BLI_spin_init(&lock); id_hash = BLI_ghash_ptr_new("Depsgraph id hash"); diff --git a/source/blender/depsgraph/intern/depsgraph_physics.cc b/source/blender/depsgraph/intern/depsgraph_physics.cc index d26ba845dd5..fb14c020f81 100644 --- a/source/blender/depsgraph/intern/depsgraph_physics.cc +++ b/source/blender/depsgraph/intern/depsgraph_physics.cc @@ -53,7 +53,7 @@ ListBase *DEG_get_effector_relations(const Depsgraph *graph, return NULL; } - return (ListBase*)BLI_ghash_lookup(deg_graph->effector_relations, collection); + return (ListBase *)BLI_ghash_lookup(deg_graph->effector_relations, collection); } /*********************** Internal API ************************/ |