diff options
-rw-r--r-- | source/blender/modifiers/intern/MOD_simulation.cc | 4 | ||||
-rw-r--r-- | source/blender/simulation/intern/simulation_collect_influences.cc | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_simulation.cc b/source/blender/modifiers/intern/MOD_simulation.cc index 85d9b47a861..382d9a6be36 100644 --- a/source/blender/modifiers/intern/MOD_simulation.cc +++ b/source/blender/modifiers/intern/MOD_simulation.cc @@ -114,10 +114,12 @@ static PointCloud *modifyPointCloud(ModifierData *md, const float3 *positions = (const float3 *)CustomData_get_layer_named( &state->attributes, CD_PROP_FLOAT3, "Position"); + const float *sizes = (const float *)CustomData_get_layer_named( + &state->attributes, CD_PROP_FLOAT, "Size"); memcpy(pointcloud->co, positions, sizeof(float3) * state->tot_particles); for (int i = 0; i < state->tot_particles; i++) { - pointcloud->radius[i] = 0.03f; + pointcloud->radius[i] = sizes[i] / 2.0f; } return pointcloud; diff --git a/source/blender/simulation/intern/simulation_collect_influences.cc b/source/blender/simulation/intern/simulation_collect_influences.cc index 4d339f9e323..c947b28fd50 100644 --- a/source/blender/simulation/intern/simulation_collect_influences.cc +++ b/source/blender/simulation/intern/simulation_collect_influences.cc @@ -740,6 +740,7 @@ static void initialize_particle_attribute_builders(CollectContext &context) /* TODO: Use uint32_t, but we don't have a corresponding custom property type. */ attributes_builder.add<int>("Hash", 0); attributes_builder.add<float>("Birth Time", 0.0f); + attributes_builder.add<float>("Size", 0.03f); context.influences.particle_attributes_builder.add_new(name, &attributes_builder); } } |