[Bf-blender-cvs] [ed64bcfb717] functions: remove Particle Info node

[Jacques Lucke]

Commit: ed64bcfb7174ca15f51de6cb32c4245f7e25a0cb
Author: Jacques Lucke
Date:   Thu Dec 19 11:53:30 2019 +0100
Branches: functions
https://developer.blender.org/rBed64bcfb7174ca15f51de6cb32c4245f7e25a0cb

remove Particle Info node

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

D	release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py
M	release/scripts/startup/nodes/menu.py
M	source/blender/functions/intern/inlined_tree_multi_function_network/mappings_nodes.cc

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

diff --git a/release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py b/release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py
deleted file mode 100644
index ea3b4237a03..00000000000
--- a/release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import bpy
-from bpy.props import *
-from .. base import SimulationNode
-from .. node_builder import NodeBuilder
-
-
-class ParticleInfoNode(bpy.types.Node, SimulationNode):
-    bl_idname = "fn_ParticleInfoNode"
-    bl_label = "Particle Info"
-
-    def declaration(self, builder: NodeBuilder):
-        builder.fixed_output("id", "ID", "Integer")
-        builder.fixed_output("position", "Position", "Vector")
-        builder.fixed_output("velocity", "Velocity", "Vector")
-        builder.fixed_output("birth_time", "Birth Time", "Float")
diff --git a/release/scripts/startup/nodes/menu.py b/release/scripts/startup/nodes/menu.py
index f5a9eeee22d..7af3c08df4f 100644
--- a/release/scripts/startup/nodes/menu.py
+++ b/release/scripts/startup/nodes/menu.py
@@ -16,7 +16,6 @@ def draw_menu(self, context):
     insert_node(layout, "fn_ParticleSystemNode", "Particle System")
     layout.menu("BP_MT_influences_nodes_menu", text="Influences")
     layout.menu("BP_MT_action_nodes_menu", text="Actions")
-    layout.menu("BP_MT_input_nodes_menu", text="Inputs")
 
 class FunctionNodesMenu(bpy.types.Menu):
     bl_idname = "FN_MT_function_nodes_menu"
@@ -82,16 +81,6 @@ class ActionNodesMenu(bpy.types.Menu):
         insert_node(layout, "fn_KillParticleNode", "Kill Particle")
         insert_node(layout, "fn_ParticleConditionNode", "Condition")
 
-class InputNodesMenu(bpy.types.Menu):
-    bl_idname = "BP_MT_input_nodes_menu"
-    bl_label = "Input Nodes Menu"
-
-    def draw(self, context):
-        layout = self.layout
-        layout.operator_context = 'INVOKE_DEFAULT'
-
-        insert_node(layout, "fn_ParticleInfoNode", "Particle Info")
-
 
 def insert_node(layout, type, text, settings = {}, icon = "NONE"):
     operator = layout.operator("node.add_node", text = text, icon = icon)
diff --git a/source/blender/functions/intern/inlined_tree_multi_function_network/mappings_nodes.cc b/source/blender/functions/intern/inlined_tree_multi_function_network/mappings_nodes.cc
index ca68cc00b7f..8c5ab3a997f 100644
--- a/source/blender/functions/intern/inlined_tree_multi_function_network/mappings_nodes.cc
+++ b/source/blender/functions/intern/inlined_tree_multi_function_network/mappings_nodes.cc
@@ -405,31 +405,6 @@ static void INSERT_perlin_noise(VNodeMFNetworkBuilder &builder)
   builder.set_constructed_matching_fn<MF_PerlinNoise>();
 }
 
-static void create_particle_info_nodes(VNodeMFNetworkBuilder &builder,
-                                       StringRef name,
-                                       const XOutputSocket &xsocket)
-{
-  InlinedTreeMFNetworkBuilder &network_builder = builder.network_builder();
-  const CPPType &type = network_builder.try_get_data_type(xsocket)->single__cpp_type();
-
-  const MultiFunction &name_fn = network_builder.construct_fn<MF_ConstantValue<std::string>>(name);
-  const MultiFunction &attribute_fn = network_builder.construct_fn<MF_ParticleAttribute>(type);
-  MFBuilderFunctionNode &name_node = network_builder.add_function(name_fn);
-  MFBuilderFunctionNode &attribute_node = network_builder.add_function(attribute_fn);
-  network_builder.add_link(name_node.output(0), attribute_node.input(0));
-  network_builder.map_sockets(xsocket, attribute_node.output(0));
-}
-
-static void INSERT_particle_info(VNodeMFNetworkBuilder &builder)
-{
-  const XNode &xnode = builder.xnode();
-
-  create_particle_info_nodes(builder, "ID", xnode.output(0));
-  create_particle_info_nodes(builder, "Position", xnode.output(1));
-  create_particle_info_nodes(builder, "Velocity", xnode.output(2));
-  create_particle_info_nodes(builder, "Birth Time", xnode.output(3));
-}
-
 static void INSERT_get_particle_attribute(VNodeMFNetworkBuilder &builder)
 {
   const CPPType &type = builder.cpp_type_from_property("attribute_type");
@@ -572,7 +547,6 @@ void add_inlined_tree_node_mapping_info(VTreeMultiFunctionMappings &mappings)
   mappings.xnode_inserters.add_new("fn_TimeInfoNode", INSERT_time_info);
   mappings.xnode_inserters.add_new("fn_CompareNode", INSERT_compare);
   mappings.xnode_inserters.add_new("fn_PerlinNoiseNode", INSERT_perlin_noise);
-  mappings.xnode_inserters.add_new("fn_ParticleInfoNode", INSERT_particle_info);
   mappings.xnode_inserters.add_new("fn_GetParticleAttributeNode", INSERT_get_particle_attribute);
   mappings.xnode_inserters.add_new("fn_ClosestLocationOnObjectNode",
                                    INSERT_closest_surface_hook_on_object);