archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Particles: rename Size attribute to Radius

Browse Source 
Doing this change for consistency with the point cloud attributes.
This commit is contained in:
Jacques Lucke
2020-07-29 12:03:21 +02:00
parent 91150c9ef5
commit 9c807325dd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/modifiers/intern/MOD_simulation.cc
View File

@@ -114,12 +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");
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] = sizes[i] / 2.0f;
pointcloud->radius[i] = radii[i];
}
return pointcloud;

2
source/blender/simulation/intern/simulation_collect_influences.cc
View File

@@ -740,7 +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);
attributes_builder.add<float>("Radius", 0.02f);
context.influences.particle_attributes_builder.add_new(name, &attributes_builder);
}
}