[Bf-blender-cvs] [c53ca3adc8b] temp-gpencil-io: Change to use Vector in object list

Antonio Vazquez noreply at git.blender.org
Wed Mar 3 17:06:43 CET 2021


Commit: c53ca3adc8b93207eefbb1b472a98ebee08ef6f6
Author: Antonio Vazquez
Date:   Wed Mar 3 16:57:46 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rBc53ca3adc8b93207eefbb1b472a98ebee08ef6f6

Change to use Vector in object list

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

M	source/blender/io/gpencil/intern/gpencil_io_base.cc
M	source/blender/io/gpencil/intern/gpencil_io_base.h

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

diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc
index 30f3314fcf7..c18020ab587 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -192,11 +192,13 @@ void GpencilIO::create_object_list(void)
         ob_list_.push_back(obz);
       }
     }
-
-    /* Sort list of objects from point of view. */
-    ob_list_.sort(
-        [](const ObjectZ &obz1, const ObjectZ &obz2) { return obz1.zdepth < obz2.zdepth; });
   }
+  /* Sort list of objects from point of view. */
+  std::sort(ob_list_.begin(), ob_list_.end(), [](const ObjectZ &obz1, const ObjectZ &obz2) {
+    return obz1.zdepth < obz2.zdepth;
+  });
+  // ob_list_.sort(
+  //    [](const ObjectZ &obz1, const ObjectZ &obz2) { return obz1.zdepth < obz2.zdepth; });
 }
 
 /**
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.h b/source/blender/io/gpencil/intern/gpencil_io_base.h
index bfb969c2e45..dfaba7c40e3 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.h
@@ -21,8 +21,8 @@
 /** \file
  * \ingroup bgpencil
  */
-#include <list>
 #include <string>
+#include <vector>
 
 #include "gpencil_io.h"
 
@@ -62,7 +62,7 @@ class GpencilIO {
   };
 
   /** List of included objects. */
-  std::list<ObjectZ> ob_list_;
+  std::vector<ObjectZ> ob_list_;
 
   /* Data for easy access. */
   struct Depsgraph *depsgraph_;



More information about the Bf-blender-cvs mailing list