BLI: simplify naming of listbase wrapper

2 files changed, 6 insertions, 9 deletions

diff --git a/source/blender/blenlib/BLI_listbase_wrapper.hh b/source/blender/blenlib/BLI_listbase_wrapper.hh
index 0eee00c87b9..02313d9d22d 100644
--- a/source/blender/blenlib/BLI_listbase_wrapper.hh
+++ b/source/blender/blenlib/BLI_listbase_wrapper.hh
@@ -29,17 +29,17 @@
 
 namespace BLI {
 
-template<typename T> class IntrusiveListBaseWrapper {
+template<typename T> class ListBaseWrapper {
  private:
   ListBase *m_listbase;
 
  public:
-  IntrusiveListBaseWrapper(ListBase *listbase) : m_listbase(listbase)
+  ListBaseWrapper(ListBase *listbase) : m_listbase(listbase)
   {
     BLI_assert(listbase);
   }
 
-  IntrusiveListBaseWrapper(ListBase &listbase) : IntrusiveListBaseWrapper(&listbase)
+  ListBaseWrapper(ListBase &listbase) : ListBaseWrapper(&listbase)
   {
   }
 
diff --git a/source/blender/blenlib/BLI_vector.hh b/source/blender/blenlib/BLI_vector.hh
index 31e046f82e8..a44962e50cc 100644
--- a/source/blender/blenlib/BLI_vector.hh
+++ b/source/blender/blenlib/BLI_vector.hh
@@ -130,13 +130,10 @@ template<typename T, uint N = 4, typename Allocator = GuardedAllocator> class Ve
   /**
    * Create a vector from a ListBase.
    */
-  Vector(ListBase &values, bool intrusive_next_and_prev_pointers) : Vector()
+  Vector(ListBase &values) : Vector()
   {
-    BLI_assert(intrusive_next_and_prev_pointers);
-    if (intrusive_next_and_prev_pointers) {
-      for (T value : IntrusiveListBaseWrapper<typename std::remove_pointer<T>::type>(values)) {
-        this->append(value);
-      }
+    for (T value : ListBaseWrapper<typename std::remove_pointer<T>::type>(values)) {
+      this->append(value);
     }
   }