[Bf-blender-cvs] [f52ff92cc39] functions: rename block.slice() to block.attributes_slice()

[Jacques Lucke]

Commit: f52ff92cc395f1c2c98cd0733be9ba6f78496bb0
Author: Jacques Lucke
Date:   Mon Jul 1 15:21:01 2019 +0200
Branches: functions
https://developer.blender.org/rBf52ff92cc395f1c2c98cd0733be9ba6f78496bb0

rename block.slice() to block.attributes_slice()

===================================================================

M	source/blender/simulations/bparticles/core.cpp
M	source/blender/simulations/bparticles/core.hpp
M	source/blender/simulations/bparticles/particles_container.hpp

===================================================================

diff --git a/source/blender/simulations/bparticles/core.cpp b/source/blender/simulations/bparticles/core.cpp
index bb1b894d504..758d21ed679 100644
--- a/source/blender/simulations/bparticles/core.cpp
+++ b/source/blender/simulations/bparticles/core.cpp
@@ -75,7 +75,7 @@ void BlockAllocator::allocate_block_ranges(uint particle_type_id,
     r_blocks.append(&block);
     r_ranges.append(range);
 
-    AttributeArrays attributes = block.slice(range);
+    AttributeArrays attributes = block.attributes_slice(range);
     for (uint i : attributes.info().attribute_indices()) {
       attributes.init_default(i);
     }
@@ -195,7 +195,7 @@ void EmitTargetBase::set_elements(uint index, void *data)
     ParticlesBlock &block = *m_blocks[part];
     Range<uint> range = m_ranges[part];
 
-    AttributeArrays attributes = block.slice(range);
+    AttributeArrays attributes = block.attributes_slice(range);
     void *dst = attributes.get_ptr(index);
     uint bytes_to_copy = element_size * attributes.size();
     memcpy(dst, remaining_data, bytes_to_copy);
diff --git a/source/blender/simulations/bparticles/core.hpp b/source/blender/simulations/bparticles/core.hpp
index 3d1a54492ca..e7f909e215c 100644
--- a/source/blender/simulations/bparticles/core.hpp
+++ b/source/blender/simulations/bparticles/core.hpp
@@ -704,7 +704,7 @@ inline uint EmitTargetBase::part_amount()
 
 inline AttributeArrays EmitTargetBase::attributes(uint part)
 {
-  return m_blocks[part]->slice(m_ranges[part]);
+  return m_blocks[part]->attributes_slice(m_ranges[part]);
 }
 
 inline uint EmitTargetBase::particle_type_id()
diff --git a/source/blender/simulations/bparticles/particles_container.hpp b/source/blender/simulations/bparticles/particles_container.hpp
index 46d9458b153..863b3244905 100644
--- a/source/blender/simulations/bparticles/particles_container.hpp
+++ b/source/blender/simulations/bparticles/particles_container.hpp
@@ -109,8 +109,8 @@ class ParticlesBlock {
   void clear();
 
   AttributeArraysCore &attributes_core();
-  AttributeArrays slice(Range<uint> range);
-  AttributeArrays slice(uint start, uint length);
+  AttributeArrays attributes_slice(Range<uint> range);
+  AttributeArrays attributes_slice(uint start, uint length);
   AttributeArrays attributes_all();
   AttributeArrays attributes();
 
@@ -200,15 +200,15 @@ inline ParticlesContainer &ParticlesBlock::container()
   return m_container;
 }
 
-inline AttributeArrays ParticlesBlock::slice(Range<uint> range)
+inline AttributeArrays ParticlesBlock::attributes_slice(Range<uint> range)
 {
   if (range.size() == 0) {
-    return this->slice(0, 0);
+    return this->attributes_slice(0, 0);
   }
-  return this->slice(range.first(), range.size());
+  return this->attributes_slice(range.first(), range.size());
 }
 
-inline AttributeArrays ParticlesBlock::slice(uint start, uint length)
+inline AttributeArrays ParticlesBlock::attributes_slice(uint start, uint length)
 {
   return m_attributes_core.slice_all().slice(start, length);
 }
@@ -220,7 +220,7 @@ inline AttributeArrays ParticlesBlock::attributes_all()
 
 inline AttributeArrays ParticlesBlock::attributes()
 {
-  return this->slice(0, m_active_amount);
+  return this->attributes_slice(0, m_active_amount);
 }
 
 inline AttributeArraysCore &ParticlesBlock::attributes_core()