Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-07-23 19:07:31 +0300
committerJacques Lucke <jacques@blender.org>2020-07-23 19:07:44 +0300
commit149bb0c26d3c66fd221403f2f810754e8adc9eb8 (patch)
tree223befe0b2b21e915213c4b3e3f51770711e4d2b /source/blender/simulation
parent87c0a38a393d3326659ec18c4598149cb40fd1f4 (diff)
Cleanup: unify naming between different spans
Diffstat (limited to 'source/blender/simulation')
-rw-r--r--source/blender/simulation/intern/particle_allocator.cc2
-rw-r--r--source/blender/simulation/intern/simulation_solver.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/simulation/intern/particle_allocator.cc b/source/blender/simulation/intern/particle_allocator.cc
index eb1e998e63a..5ff5909f506 100644
--- a/source/blender/simulation/intern/particle_allocator.cc
+++ b/source/blender/simulation/intern/particle_allocator.cc
@@ -68,7 +68,7 @@ fn::MutableAttributesRef ParticleAllocator::allocate(int size)
}
}
else {
- type.fill_uninitialized(info.default_of(i), attributes.get(i).buffer(), size);
+ type.fill_uninitialized(info.default_of(i), attributes.get(i).data(), size);
}
}
return attributes;
diff --git a/source/blender/simulation/intern/simulation_solver.cc b/source/blender/simulation/intern/simulation_solver.cc
index 0328b5a0042..2bd9e72eeac 100644
--- a/source/blender/simulation/intern/simulation_solver.cc
+++ b/source/blender/simulation/intern/simulation_solver.cc
@@ -234,7 +234,7 @@ BLI_NOINLINE static void remove_dead_and_add_new_particles(ParticleSimulationSta
if (layer.data != nullptr) {
MEM_freeN(layer.data);
}
- layer.data = new_buffer.buffer();
+ layer.data = new_buffer.data();
}
BLI_assert(dead_layer != nullptr);