[Bf-blender-cvs] [b5d2265b60b] functions: remove unused functions

Jacques Lucke noreply at git.blender.org
Mon Sep 16 16:01:11 CEST 2019


Commit: b5d2265b60be2db83211a5b6027970d8de090eed
Author: Jacques Lucke
Date:   Mon Sep 16 11:57:59 2019 +0200
Branches: functions
https://developer.blender.org/rBb5d2265b60be2db83211a5b6027970d8de090eed

remove unused functions

===================================================================

M	source/blender/simulations/bparticles/node_frontend.cpp
M	source/blender/simulations/bparticles/particle_function.hpp

===================================================================

diff --git a/source/blender/simulations/bparticles/node_frontend.cpp b/source/blender/simulations/bparticles/node_frontend.cpp
index 508a15351bc..5b8e66d4ed7 100644
--- a/source/blender/simulations/bparticles/node_frontend.cpp
+++ b/source/blender/simulations/bparticles/node_frontend.cpp
@@ -619,10 +619,6 @@ static void PARSE_mesh_collision(InfluencesCollector &collector,
     return;
   }
 
-  if (inputs_fn->parameter_depends_on_particle("Object", 0)) {
-    return;
-  }
-
   Optional<NamedTupleRef> inputs = vtree_data.compute_inputs(vnode, {0});
   if (!inputs.has_value()) {
     return;
diff --git a/source/blender/simulations/bparticles/particle_function.hpp b/source/blender/simulations/bparticles/particle_function.hpp
index 6a1869fbddc..6b314e1bc48 100644
--- a/source/blender/simulations/bparticles/particle_function.hpp
+++ b/source/blender/simulations/bparticles/particle_function.hpp
@@ -231,29 +231,6 @@ class ParticleFunction {
 
   ~ParticleFunction();
 
-  SharedFunction &function_no_deps()
-  {
-    return m_fn_no_deps;
-  }
-
-  bool parameter_depends_on_particle(StringRef expected_name, uint parameter_index)
-  {
-    bool depends_on_particle = m_parameter_depends_on_particle[parameter_index];
-#ifdef DEBUG
-    uint output_index = m_output_indices[parameter_index];
-    if (depends_on_particle) {
-      StringRefNull real_name = m_fn_with_deps->output_name(output_index);
-      BLI_assert(expected_name == real_name);
-    }
-    else {
-      StringRefNull real_name = m_fn_no_deps->output_name(output_index);
-      BLI_assert(expected_name == real_name);
-    }
-#endif
-    UNUSED_VARS_NDEBUG(expected_name);
-    return depends_on_particle;
-  }
-
   std::unique_ptr<ParticleFunctionResult> compute(ActionInterface &interface);
   std::unique_ptr<ParticleFunctionResult> compute(OffsetHandlerInterface &interface);
   std::unique_ptr<ParticleFunctionResult> compute(ForceInterface &interface);



More information about the Bf-blender-cvs mailing list