1 files changed, 47 insertions, 13 deletions

diff --git a/source/blender/modifiers/intern/MOD_simulation.cc b/source/blender/modifiers/intern/MOD_simulation.cc
index d55900dc7a9..edfcc16af85 100644
--- a/source/blender/modifiers/intern/MOD_simulation.cc
+++ b/source/blender/modifiers/intern/MOD_simulation.cc
@@ -29,6 +29,7 @@
 
 #include "BLI_float3.hh"
 #include "BLI_listbase.h"
+#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_mesh_types.h"
@@ -47,6 +48,8 @@
 #include "BKE_pointcloud.h"
 #include "BKE_simulation.h"
 
+#include "BLO_read_write.h"
+
 /* SpaceType struct has a member called 'new' which obviously conflicts with C++
  * so temporarily redefining the new keyword to make it compile. */
 #define new extern_new
@@ -90,15 +93,8 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
 
 static const ParticleSimulationState *find_particle_state(SimulationModifierData *smd)
 {
-  if (smd->simulation == nullptr) {
-    return nullptr;
-  }
-  LISTBASE_FOREACH (const SimulationState *, state, &smd->simulation->states) {
-    if (state->type == SIM_STATE_TYPE_PARTICLES) {
-      return (ParticleSimulationState *)state;
-    }
-  }
-  return nullptr;
+  return (const ParticleSimulationState *)BKE_simulation_state_try_find_by_name_and_type(
+      smd->simulation, smd->data_path, SIM_TYPE_NAME_PARTICLE_SIMULATION);
 }
 
 static PointCloud *modifyPointCloud(ModifierData *md,
@@ -117,11 +113,13 @@ static PointCloud *modifyPointCloud(ModifierData *md,
   }
 
   const float3 *positions = (const float3 *)CustomData_get_layer_named(
-      &state->attributes, CD_LOCATION, "Position");
+      &state->attributes, CD_PROP_FLOAT3, "Position");
+  const float *radii = (const float *)CustomData_get_layer_named(
+      &state->attributes, CD_PROP_FLOAT, "Radius");
   memcpy(pointcloud->co, positions, sizeof(float3) * state->tot_particles);
 
   for (int i = 0; i < state->tot_particles; i++) {
-    pointcloud->radius[i] = 0.05f;
+    pointcloud->radius[i] = radii[i];
   }
 
   return pointcloud;
@@ -135,6 +133,9 @@ static void panel_draw(const bContext *C, Panel *panel)
   PointerRNA ob_ptr;
   modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);
 
+  uiLayoutSetPropSep(layout, true);
+  uiLayoutSetPropDecorate(layout, false);
+
   uiItemR(layout, &ptr, "simulation", 0, NULL, ICON_NONE);
   uiItemR(layout, &ptr, "data_path", 0, NULL, ICON_NONE);
 
@@ -146,6 +147,37 @@ static void panelRegister(ARegionType *region_type)
   modifier_panel_register(region_type, eModifierType_Simulation, panel_draw);
 }
 
+static void blendWrite(BlendWriter *writer, const ModifierData *md)
+{
+  const SimulationModifierData *smd = (const SimulationModifierData *)md;
+  BLO_write_string(writer, smd->data_path);
+}
+
+static void blendRead(BlendDataReader *reader, ModifierData *md)
+{
+  SimulationModifierData *smd = (SimulationModifierData *)md;
+  BLO_read_data_address(reader, &smd->data_path);
+}
+
+static void copyData(const ModifierData *md, ModifierData *target, const int flag)
+{
+  const SimulationModifierData *smd = (const SimulationModifierData *)md;
+  SimulationModifierData *tsmd = (SimulationModifierData *)target;
+
+  BKE_modifier_copydata_generic(md, target, flag);
+  if (smd->data_path != nullptr) {
+    tsmd->data_path = BLI_strdup(smd->data_path);
+  }
+}
+
+static void freeData(ModifierData *md)
+{
+  SimulationModifierData *smd = (SimulationModifierData *)md;
+  if (smd->data_path) {
+    MEM_freeN(smd->data_path);
+  }
+}
+
 ModifierTypeInfo modifierType_Simulation = {
     /* name */ "Simulation",
     /* structName */ "SimulationModifierData",
@@ -153,7 +185,7 @@ ModifierTypeInfo modifierType_Simulation = {
     /* type */ eModifierTypeType_None,
     /* flags */ (ModifierTypeFlag)0,
 
-    /* copyData */ BKE_modifier_copydata_generic,
+    /* copyData */ copyData,
 
     /* deformVerts */ NULL,
     /* deformMatrices */ NULL,
@@ -166,7 +198,7 @@ ModifierTypeInfo modifierType_Simulation = {
 
     /* initData */ NULL,
     /* requiredDataMask */ NULL,
-    /* freeData */ NULL,
+    /* freeData */ freeData,
     /* isDisabled */ isDisabled,
     /* updateDepsgraph */ updateDepsgraph,
     /* dependsOnTime */ NULL,
@@ -176,4 +208,6 @@ ModifierTypeInfo modifierType_Simulation = {
     /* foreachTexLink */ NULL,
     /* freeRuntimeData */ NULL,
     /* panelRegister */ panelRegister,
+    /* blendWrite */ blendWrite,
+    /* blendRead */ blendRead,
 };