Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / builder / deg_builder_nodes.cc
index e1420834786ae98c7f2f04288448febb2f2f0050..5ec541612f5fe39597809dc34d51486477524dca 100644 (file)
@@ -426,8 +426,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 */
@@ -720,10 +720,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.
@@ -734,16 +734,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
@@ -790,12 +790,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;
                }
@@ -809,12 +809,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;
@@ -827,12 +827,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. */
@@ -866,12 +866,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;
                }
@@ -948,7 +948,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... */