5 files changed, 2 insertions, 66 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 2668b3eb6ca..6aec3c39b29 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -446,7 +446,7 @@ typedef enum ID_Type {
   ID_HA = MAKE_ID2('H', 'A'),  /* Hair */
   ID_PT = MAKE_ID2('P', 'T'),  /* PointCloud */
   ID_VO = MAKE_ID2('V', 'O'),  /* Volume */
-  ID_SIM = MAKE_ID2('S', 'I'), /* Simulation */
+  ID_SIM = MAKE_ID2('S', 'I'), /* Simulation (currently unused) */
 } ID_Type;
 
 /* Only used as 'placeholder' in .blend files for directly linked data-blocks. */
diff --git a/source/blender/makesdna/DNA_modifier_defaults.h b/source/blender/makesdna/DNA_modifier_defaults.h
index 3aca558cdbe..44b4e9b855e 100644
--- a/source/blender/makesdna/DNA_modifier_defaults.h
+++ b/source/blender/makesdna/DNA_modifier_defaults.h
@@ -576,8 +576,6 @@
 
 #define _DNA_DEFAULT_SimulationModifierData \
   { \
-    .simulation = NULL, \
-    .data_path = NULL, \
   }
 
 #define _DNA_DEFAULT_SkinModifierData \
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 34d2c80dc5d..29bcc5fe903 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -2219,9 +2219,6 @@ enum {
 
 typedef struct SimulationModifierData {
   ModifierData modifier;
-
-  struct Simulation *simulation;
-  char *data_path;
 } SimulationModifierData;
 
 typedef struct MeshToVolumeModifierData {
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 33856dc2622..cba93bbadfc 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -155,10 +155,6 @@ typedef enum eNodeSocketDatatype {
   SOCK_STRING = 7,
   SOCK_OBJECT = 8,
   SOCK_IMAGE = 9,
-  SOCK_EMITTERS = 10,
-  SOCK_EVENTS = 11,
-  SOCK_FORCES = 12,
-  SOCK_CONTROL_FLOW = 13,
 } eNodeSocketDatatype;
 
 /* socket shape */
diff --git a/source/blender/makesdna/DNA_simulation_types.h b/source/blender/makesdna/DNA_simulation_types.h
index 8cc2db99332..4ff694b29cc 100644
--- a/source/blender/makesdna/DNA_simulation_types.h
+++ b/source/blender/makesdna/DNA_simulation_types.h
@@ -27,69 +27,14 @@ typedef struct Simulation {
   ID id;
   struct AnimData *adt; /* animation data (must be immediately after id) */
 
+  /* This nodetree is embedded into the data block. */
   struct bNodeTree *nodetree;
 
   uint32_t flag;
-
-  /** This is the frame in scene time, that the states correspond to. */
-  float current_frame;
-
-  /** Time since the start of the simulation in simulation time (which might differ from scene
-   * time). */
-  float current_simulation_time;
   char _pad[4];
-
-  /** List containing SimulationState objects. */
-  struct ListBase states;
-
-  /** List containing SimulationDependency objects. */
-  struct ListBase dependencies;
 } Simulation;
 
-typedef struct SimulationState {
-  struct SimulationState *next;
-  struct SimulationState *prev;
-
-  char *type;
-  char *name;
-} SimulationState;
-
-typedef struct ParticleSimulationState {
-  SimulationState head;
-
-  /** Contains the state of the particles at time Simulation->current_frame. */
-  int32_t tot_particles;
-  int32_t next_particle_id;
-  struct CustomData attributes;
-} ParticleSimulationState;
-
-typedef struct ParticleMeshEmitterSimulationState {
-  SimulationState head;
-
-  float last_birth_time;
-  char _pad[4];
-} ParticleMeshEmitterSimulationState;
-
-/** Stores a reference to data that the simulation depends on. This is partially derived from the
- * simulation node tree. */
-typedef struct SimulationDependency {
-  struct SimulationDependency *next;
-  struct SimulationDependency *prev;
-  struct ID *id;
-  int32_t handle;
-  uint32_t flag;
-} SimulationDependency;
-
 /* Simulation.flag */
 enum {
   SIM_DS_EXPAND = (1 << 0),
 };
-
-/* SimulationDependency.flag */
-enum {
-  SIM_DEPENDS_ON_TRANSFORM = (1 << 0),
-  SIM_DEPENDS_ON_GEOMETRY = (1 << 1),
-};
-
-#define SIM_TYPE_NAME_PARTICLE_SIMULATION "Particle Simulation"
-#define SIM_TYPE_NAME_PARTICLE_MESH_EMITTER "Particle Mesh Emitter"