diff options
author | Jacques Lucke <jacques@blender.org> | 2020-07-15 17:48:30 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-07-15 17:48:30 +0300 |
commit | 19d17b217ae0d1a89413e0f3f3b7be16614a535c (patch) | |
tree | 3d8b26cbbeca12727c3d043a9ad6f45d853737b4 /source/blender/blenkernel/intern/pointcache.c | |
parent | 57ec1f37e9a8c59a77f8cbdd1e22dd7b6c031c29 (diff) |
Particles: use CD_PROP_FLOAT3 instead of CD_LOCATION
`CD_LOCATION` was only used temporarily due to the lack
of a better alternative. This also removes the name from
`CD_LOCATION` again, because at most one layer of this
type should exist.
Diffstat (limited to 'source/blender/blenkernel/intern/pointcache.c')
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 9a9d8dc215b..aa93c6cb854 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1900,7 +1900,7 @@ static int ptcache_sim_particle_write(int index, void *state_v, void **data, int ParticleSimulationState *state = (ParticleSimulationState *)state_v; const float *positions = (const float *)CustomData_get_layer_named( - &state->attributes, CD_LOCATION, "Position"); + &state->attributes, CD_PROP_FLOAT3, "Position"); PTCACHE_DATA_FROM(data, BPHYS_DATA_LOCATION, positions + (index * 3)); @@ -1913,7 +1913,7 @@ static void ptcache_sim_particle_read( BLI_assert(index < state->tot_particles); float *positions = (float *)CustomData_get_layer_named( - &state->attributes, CD_LOCATION, "Position"); + &state->attributes, CD_PROP_FLOAT3, "Position"); PTCACHE_DATA_TO(data, BPHYS_DATA_LOCATION, 0, positions + (index * 3)); } |