Merge branch 'master' into blender2.8

[blender.git] / source / blender / depsgraph / intern / builder / deg_builder_nodes.cc

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 18cfdb3593ae26b31f96099acb991c7c1dcf93d2..688d4ad435cb4aa460a56afc98d57ccc82ed82a7 100644 (file)
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -58,7 +58,6 @@ extern "C" {
 #include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_node_types.h"
-#include "DNA_particle_types.h"
 #include "DNA_object_types.h"
 #include "DNA_rigidbody_types.h"
 #include "DNA_scene_types.h"
@@ -85,7 +84,6 @@ extern "C" {
 #include "BKE_modifier.h"
 #include "BKE_node.h"
 #include "BKE_object.h"
-#include "BKE_particle.h"
 #include "BKE_rigidbody.h"
 #include "BKE_sound.h"
 #include "BKE_texture.h"
@@ -476,11 +474,6 @@ void DepsgraphNodeBuilder::build_object(Scene *scene, Base *base, Object *ob)
         */
        build_animdata(&ob->id);
 
-       /* particle systems */
-       if (ob->particlesystem.first) {
-               build_particles(scene, ob);
-       }
-
        /* grease pencil */
        if (ob->gpd) {
                build_gpencil(ob->gpd);
@@ -712,46 +705,6 @@ void DepsgraphNodeBuilder::build_rigidbody(Scene *scene)
        }
 }
 
-void DepsgraphNodeBuilder::build_particles(Scene *scene, Object *ob)
-{
-       /**
-        * Particle Systems Nodes
-        * ======================
-        *
-        * There are two types of nodes associated with representing
-        * particle systems:
-        *  1) Component (EVAL_PARTICLES) - This is the particle-system
-        *     evaluation context for an object. It acts as the container
-        *     for all the nodes associated with a particular set of particle
-        *     systems.
-        *  2) Particle System Eval Operation - This operation node acts as a
-        *     blackbox evaluation step for one particle system referenced by
-        *     the particle systems stack. All dependencies link to this operation.
-        */
-
-       /* component for all particle systems */
-       ComponentDepsNode *psys_comp = add_component_node(&ob->id, DEPSNODE_TYPE_EVAL_PARTICLES);
-
-       /* particle systems */
-       for (ParticleSystem *psys = (ParticleSystem *)ob->particlesystem.first; psys; psys = psys->next) {
-               ParticleSettings *part = psys->part;
-
-               /* particle settings */
-               // XXX: what if this is used more than once!
-               build_animdata(&part->id);
-
-               /* this particle system */
-               // TODO: for now, this will just be a placeholder "ubereval" node
-               add_operation_node(psys_comp,
-                                  DEPSOP_TYPE_EXEC, function_bind(BKE_particle_system_eval, _1, scene, ob, psys),
-                                  DEG_OPCODE_PSYS_EVAL,
-                                  psys->name);
-       }
-
-       /* pointcache */
-       // TODO...
-}
-
 /* IK Solver Eval Steps */
 void DepsgraphNodeBuilder::build_ik_pose(Scene *scene, Object *ob, bPoseChannel *pchan, bConstraint *con)
 {