diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-14 13:01:52 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-14 13:01:52 +0300 |
commit | 481cf2982b1387105e27cfced0d1d83400d665e2 (patch) | |
tree | 74b7953df98de4671204888be07141a535e82630 | |
parent | 20e5052a72215fa432f7b74cd4b77a5fd8c8e7f1 (diff) |
Depsgraph: Cleanup, indentation
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 76 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc | 6 |
2 files changed, 41 insertions, 41 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 4419f65d8bf..55f1f93be6a 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -436,8 +436,8 @@ void DepsgraphNodeBuilder::build_object_transform(Scene *scene, Object *ob) /* local transforms (from transform channels - loc/rot/scale + deltas) */ op_node = add_operation_node(&ob->id, DEG_NODE_TYPE_TRANSFORM, - function_bind(BKE_object_eval_local_transform, _1, scene, ob), - DEG_OPCODE_TRANSFORM_LOCAL); + function_bind(BKE_object_eval_local_transform, _1, scene, ob), + DEG_OPCODE_TRANSFORM_LOCAL); op_node->set_as_entry(); /* object parent */ @@ -730,10 +730,10 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob) * Does this depend on other nodes? */ op_node = add_operation_node(&ob->id, - DEG_NODE_TYPE_PARAMETERS, - NULL, - DEG_OPCODE_PLACEHOLDER, - "Parameters Eval"); + DEG_NODE_TYPE_PARAMETERS, + NULL, + DEG_OPCODE_PLACEHOLDER, + "Parameters Eval"); op_node->set_as_exit(); /* Temporary uber-update node, which does everything. @@ -744,16 +744,16 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob) * TODO(sergey): Get rid of this node. */ op_node = add_operation_node(&ob->id, - DEG_NODE_TYPE_GEOMETRY, - function_bind(BKE_object_eval_uber_data, _1, scene, ob), - DEG_OPCODE_GEOMETRY_UBEREVAL); + DEG_NODE_TYPE_GEOMETRY, + function_bind(BKE_object_eval_uber_data, _1, scene, ob), + DEG_OPCODE_GEOMETRY_UBEREVAL); op_node->set_as_exit(); op_node = add_operation_node(&ob->id, - DEG_NODE_TYPE_GEOMETRY, - NULL, - DEG_OPCODE_PLACEHOLDER, - "Eval Init"); + DEG_NODE_TYPE_GEOMETRY, + NULL, + DEG_OPCODE_PLACEHOLDER, + "Eval Init"); op_node->set_as_entry(); // TODO: "Done" operation @@ -800,12 +800,12 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob) /* evaluation operations */ op_node = add_operation_node(obdata, - DEG_NODE_TYPE_GEOMETRY, - function_bind(BKE_mesh_eval_geometry, - _1, - (Mesh *)obdata), - DEG_OPCODE_PLACEHOLDER, - "Geometry Eval"); + DEG_NODE_TYPE_GEOMETRY, + function_bind(BKE_mesh_eval_geometry, + _1, + (Mesh *)obdata), + DEG_OPCODE_PLACEHOLDER, + "Geometry Eval"); op_node->set_as_entry(); break; } @@ -819,12 +819,12 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob) /* metaball evaluation operations */ /* NOTE: only the motherball gets evaluated! */ op_node = add_operation_node(obdata, - DEG_NODE_TYPE_GEOMETRY, - function_bind(BKE_mball_eval_geometry, - _1, - (MetaBall *)obdata), - DEG_OPCODE_PLACEHOLDER, - "Geometry Eval"); + DEG_NODE_TYPE_GEOMETRY, + function_bind(BKE_mball_eval_geometry, + _1, + (MetaBall *)obdata), + DEG_OPCODE_PLACEHOLDER, + "Geometry Eval"); op_node->set_as_entry(); } break; @@ -837,12 +837,12 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob) /* Curve/nurms evaluation operations. */ /* - calculate curve geometry (including path) */ op_node = add_operation_node(obdata, - DEG_NODE_TYPE_GEOMETRY, - function_bind(BKE_curve_eval_geometry, - _1, - (Curve *)obdata), - DEG_OPCODE_PLACEHOLDER, - "Geometry Eval"); + DEG_NODE_TYPE_GEOMETRY, + function_bind(BKE_curve_eval_geometry, + _1, + (Curve *)obdata), + DEG_OPCODE_PLACEHOLDER, + "Geometry Eval"); op_node->set_as_entry(); /* Calculate curve path - this is used by constraints, etc. */ @@ -876,12 +876,12 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob) { /* Lattice evaluation operations. */ op_node = add_operation_node(obdata, - DEG_NODE_TYPE_GEOMETRY, - function_bind(BKE_lattice_eval_geometry, - _1, - (Lattice *)obdata), - DEG_OPCODE_PLACEHOLDER, - "Geometry Eval"); + DEG_NODE_TYPE_GEOMETRY, + function_bind(BKE_lattice_eval_geometry, + _1, + (Lattice *)obdata), + DEG_OPCODE_PLACEHOLDER, + "Geometry Eval"); op_node->set_as_entry(); break; } @@ -958,7 +958,7 @@ void DepsgraphNodeBuilder::build_nodetree(bNodeTree *ntree) /* Parameters for drivers. */ op_node = add_operation_node(ntree_id, DEG_NODE_TYPE_PARAMETERS, NULL, - DEG_OPCODE_PLACEHOLDER, "Parameters Eval"); + DEG_OPCODE_PLACEHOLDER, "Parameters Eval"); op_node->set_as_exit(); /* nodetree's nodes... */ diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc index 2cf0f3a342f..fe7ccaa7fc0 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc @@ -255,9 +255,9 @@ void DepsgraphNodeBuilder::build_proxy_rig(Object *ob) } op_node = add_operation_node(&ob->id, - DEG_NODE_TYPE_EVAL_POSE, - function_bind(BKE_pose_eval_proxy_copy, _1, ob), - DEG_OPCODE_POSE_INIT); + DEG_NODE_TYPE_EVAL_POSE, + function_bind(BKE_pose_eval_proxy_copy, _1, ob), + DEG_OPCODE_POSE_INIT); op_node->set_as_entry(); LINKLIST_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) { |