[Bf-blender-cvs] [b6820e4a871] functions: fixes

[Jacques Lucke]

Commit: b6820e4a87187343469ff1ff112186a3ce7bff6d
Author: Jacques Lucke
Date:   Fri Jul 12 12:17:43 2019 +0200
Branches: functions
https://developer.blender.org/rBb6820e4a87187343469ff1ff112186a3ce7bff6d

fixes

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

M	source/blender/functions/frontends/data_flow_nodes/inserters.cpp
M	source/blender/simulations/bparticles/emitters.cpp
M	source/blender/simulations/bparticles/inserters.cpp

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

diff --git a/source/blender/functions/frontends/data_flow_nodes/inserters.cpp b/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
index 57a1817feac..8719df4406f 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
@@ -142,9 +142,6 @@ class SocketLoaderDependencies : public DependenciesBody {
         }
       }
     }
-
-    auto objects = deps.get_input_objects(0);
-    deps.depends_on_transforms_of(objects);
   }
 };
 
diff --git a/source/blender/simulations/bparticles/emitters.cpp b/source/blender/simulations/bparticles/emitters.cpp
index f941b85917c..31ae2af909a 100644
--- a/source/blender/simulations/bparticles/emitters.cpp
+++ b/source/blender/simulations/bparticles/emitters.cpp
@@ -67,7 +67,7 @@ class SurfaceEmitter : public Emitter {
 
     m_compute_inputs_body->call(fn_in, fn_out, execution_context);
     Object *object = fn_out.get<Object *>(0);
-    float rate = fn_out.get<float>(1);
+    float rate = std::max(0.0f, fn_out.get<float>(1));
     float normal_velocity_factor = fn_out.get<float>(2);
     float emitter_velocity_factor = fn_out.get<float>(3);
     float size = fn_out.get<float>(4);
diff --git a/source/blender/simulations/bparticles/inserters.cpp b/source/blender/simulations/bparticles/inserters.cpp
index 21d8c4f201e..2daa37de5e5 100644
--- a/source/blender/simulations/bparticles/inserters.cpp
+++ b/source/blender/simulations/bparticles/inserters.cpp
@@ -247,6 +247,8 @@ static std::unique_ptr<Emitter> BUILD_EMITTER_mesh_surface(BuildContext &ctx,
   ArrayRef<Object *> objects = deps_builder.get_output_objects(0);
   objects.print_as_lines("Possible Objects",
                          [](const Object *object) { std::cout << object->id.name; });
+  deps_builder.get_transform_dependencies().print_as_lines(
+      "Transformation Dependencies", [](const Object *object) { std::cout << object->id.name; });
 
   auto action = build_action(ctx, {bSocketList(bnode->outputs).get(0), bnode});
   return EMITTER_mesh_surface(particle_type_name, fn, ctx.world_state, std::move(action));