Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-10-20 13:07:42 +0300
committerJacques Lucke <jacques@blender.org>2020-10-20 13:07:42 +0300
commit6ced026ae1547ac28c88516a0d061315aeacc913 (patch)
tree60c61867746df72e8cf87efd47d5d27fbbb27109 /source/blender/blenkernel/intern/node.c
parent63a9f24b55d0b5d84d625bdbb44d498fb1f2ae01 (diff)
Simulation: remove particle nodes with outdated design
The design for how we approach the "Everything Nodes" project has changed. We will focus on a different part of the project initially. While future me will likely refer back to some of the code I remove here, there is no point in keeping this code around in master currently. It would just confuse other developers working on the project. This does not remove the simulation modifier and data block. Those are just cleaned up, so that the boilerplate code can be reused in the future.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
-rw-r--r--source/blender/blenkernel/intern/node.c70
1 files changed, 0 insertions, 70 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index cf31b5338cb..80a553ff525 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -281,10 +281,6 @@ static void library_foreach_node_socket(LibraryForeachIDData *data, bNodeSocket
case __SOCK_MESH:
case SOCK_CUSTOM:
case SOCK_SHADER:
- case SOCK_EMITTERS:
- case SOCK_EVENTS:
- case SOCK_FORCES:
- case SOCK_CONTROL_FLOW:
break;
}
}
@@ -377,10 +373,6 @@ static void write_node_socket_default_value(BlendWriter *writer, bNodeSocket *so
case __SOCK_MESH:
case SOCK_CUSTOM:
case SOCK_SHADER:
- case SOCK_EMITTERS:
- case SOCK_EVENTS:
- case SOCK_FORCES:
- case SOCK_CONTROL_FLOW:
BLI_assert(false);
break;
}
@@ -723,10 +715,6 @@ static void lib_link_node_socket(BlendLibReader *reader, Library *lib, bNodeSock
case __SOCK_MESH:
case SOCK_CUSTOM:
case SOCK_SHADER:
- case SOCK_EMITTERS:
- case SOCK_EVENTS:
- case SOCK_FORCES:
- case SOCK_CONTROL_FLOW:
break;
}
}
@@ -805,10 +793,6 @@ static void expand_node_socket(BlendExpander *expander, bNodeSocket *sock)
case __SOCK_MESH:
case SOCK_CUSTOM:
case SOCK_SHADER:
- case SOCK_EMITTERS:
- case SOCK_EVENTS:
- case SOCK_FORCES:
- case SOCK_CONTROL_FLOW:
break;
}
}
@@ -1361,10 +1345,6 @@ static void socket_id_user_increment(bNodeSocket *sock)
case __SOCK_MESH:
case SOCK_CUSTOM:
case SOCK_SHADER:
- case SOCK_EMITTERS:
- case SOCK_EVENTS:
- case SOCK_FORCES:
- case SOCK_CONTROL_FLOW:
break;
}
}
@@ -1391,10 +1371,6 @@ static void socket_id_user_decrement(bNodeSocket *sock)
case __SOCK_MESH:
case SOCK_CUSTOM:
case SOCK_SHADER:
- case SOCK_EMITTERS:
- case SOCK_EVENTS:
- case SOCK_FORCES:
- case SOCK_CONTROL_FLOW:
break;
}
}
@@ -1522,14 +1498,6 @@ const char *nodeStaticSocketType(int type, int subtype)
return "NodeSocketObject";
case SOCK_IMAGE:
return "NodeSocketImage";
- case SOCK_EMITTERS:
- return "NodeSocketEmitters";
- case SOCK_EVENTS:
- return "NodeSocketEvents";
- case SOCK_FORCES:
- return "NodeSocketForces";
- case SOCK_CONTROL_FLOW:
- return "NodeSocketControlFlow";
}
return NULL;
}
@@ -1595,14 +1563,6 @@ const char *nodeStaticSocketInterfaceType(int type, int subtype)
return "NodeSocketInterfaceObject";
case SOCK_IMAGE:
return "NodeSocketInterfaceImage";
- case SOCK_EMITTERS:
- return "NodeSocketInterfaceEmitters";
- case SOCK_EVENTS:
- return "NodeSocketInterfaceEvents";
- case SOCK_FORCES:
- return "NodeSocketInterfaceForces";
- case SOCK_CONTROL_FLOW:
- return "NodeSocketInterfaceControlFlow";
}
return NULL;
}
@@ -4008,16 +3968,6 @@ void ntreeUpdateAllUsers(Main *main, ID *ngroup)
FOREACH_NODETREE_END;
}
-static void ntreeUpdateSimulationDependencies(Main *main, bNodeTree *simulation_ntree)
-{
- FOREACH_NODETREE_BEGIN (main, ntree, owner_id) {
- if (GS(owner_id->name) == ID_SIM && ntree == simulation_ntree) {
- BKE_simulation_update_dependencies((Simulation *)owner_id, main);
- }
- }
- FOREACH_NODETREE_END;
-}
-
void ntreeUpdateTree(Main *bmain, bNodeTree *ntree)
{
if (!ntree) {
@@ -4073,11 +4023,6 @@ void ntreeUpdateTree(Main *bmain, bNodeTree *ntree)
ntree_validate_links(ntree);
}
- if (bmain != NULL && ntree->typeinfo == ntreeType_Simulation &&
- (ntree->id.flag & LIB_EMBEDDED_DATA)) {
- ntreeUpdateSimulationDependencies(bmain, ntree);
- }
-
/* clear update flags */
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
node->update = 0;
@@ -4704,21 +4649,6 @@ static void registerTextureNodes(void)
static void registerSimulationNodes(void)
{
register_node_type_sim_group();
-
- register_node_type_sim_particle_simulation();
- register_node_type_sim_force();
- register_node_type_sim_set_particle_attribute();
- register_node_type_sim_particle_birth_event();
- register_node_type_sim_particle_time_step_event();
- register_node_type_sim_execute_condition();
- register_node_type_sim_multi_execute();
- register_node_type_sim_particle_mesh_emitter();
- register_node_type_sim_particle_mesh_collision_event();
- register_node_type_sim_emit_particles();
- register_node_type_sim_time();
- register_node_type_sim_particle_attribute();
- register_node_type_sim_age_reached_event();
- register_node_type_sim_kill_particle();
}
static void registerFunctionNodes(void)