[Bf-blender-cvs] [7c123f2da59] gpencil-new-data-proposal: refactor

Amelie Fondevilla noreply at git.blender.org
Mon Dec 12 18:19:29 CET 2022


Commit: 7c123f2da590f6fc4bc8a079f0f2822e05b647dd
Author: Amelie Fondevilla
Date:   Mon Dec 12 15:47:09 2022 +0100
Branches: gpencil-new-data-proposal
https://developer.blender.org/rB7c123f2da590f6fc4bc8a079f0f2822e05b647dd

refactor

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

M	source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc

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

diff --git a/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc b/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
index ccd71823821..853aaaad43f 100644
--- a/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
+++ b/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
@@ -14,21 +14,15 @@ GPData convert_old_to_new_gpencil_data(bGPdata *old_gpd)
 {
   GPData new_gpd;
 
-  /* Add all layers */
-  Vector<std::string> layer_names;
+  int layer_index{0};
   LISTBASE_FOREACH (bGPDlayer *, lay, &old_gpd->layers) {
-    layer_names.append(std::string(lay->info));
-  }
-  new_gpd.add_layers(layer_names.as_span());
+    new_gpd.add_layer(std::string(lay->info));
 
-  /* Add all frames */
-  int layer_index{-1};
-  LISTBASE_FOREACH (bGPDlayer *, lay, &old_gpd->layers) {
-    Vector<int> frame_indices;
     LISTBASE_FOREACH (bGPDframe *, frm, &lay->frames) {
-      frame_indices.append(frm->framenum);
+      new_gpd.add_frame_on_layer(layer_index, frm->framenum);
     }
-    new_gpd.add_frames_on_layer(++layer_index, frame_indices.as_span());
+
+    ++layer_index;
   }
 
   return new_gpd;



More information about the Bf-blender-cvs mailing list