[Bf-blender-cvs] [9929b367df6] gpencil-new-data-proposal: refactor

[Amelie Fondevilla]

Commit: 9929b367df68cc8028d1a342d6b822fd269d6baf
Author: Amelie Fondevilla
Date:   Mon Dec 12 16:29:13 2022 +0100
Branches: gpencil-new-data-proposal
https://developer.blender.org/rB9929b367df68cc8028d1a342d6b822fd269d6baf

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 853aaaad43f..267d6cf067a 100644
--- a/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
+++ b/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
@@ -15,11 +15,12 @@ GPData convert_old_to_new_gpencil_data(bGPdata *old_gpd)
   GPData new_gpd;
 
   int layer_index{0};
-  LISTBASE_FOREACH (bGPDlayer *, lay, &old_gpd->layers) {
-    new_gpd.add_layer(std::string(lay->info));
+  LISTBASE_FOREACH (bGPDlayer *, old_gpl, &old_gpd->layers) {
+    new_gpd.add_layer(std::string(old_gpl->info));
 
-    LISTBASE_FOREACH (bGPDframe *, frm, &lay->frames) {
-      new_gpd.add_frame_on_layer(layer_index, frm->framenum);
+    LISTBASE_FOREACH (bGPDframe *, old_gpf, &old_gpl->frames) {
+      int new_gpf_index{new_gpd.add_frame_on_layer(layer_index, old_gpf->framenum)};
+      GPFrame &new_gpf{new_gpd.frames_for_write(new_gpf_index)};
     }
 
     ++layer_index;
@@ -30,19 +31,20 @@ GPData convert_old_to_new_gpencil_data(bGPdata *old_gpd)
 
 bGPdata *convert_new_to_old_gpencil_data(const GPData &new_gpd)
 {
-  bGPdata *gpd = reinterpret_cast<bGPdata *>(MEM_mallocN(sizeof(bGPdata), __func__));
+  bGPdata *old_gpd = reinterpret_cast<bGPdata *>(MEM_mallocN(sizeof(bGPdata), __func__));
 
-  BLI_listbase_clear(&gpd->layers);
-  gpd->totlayer = gpd->totframe = gpd->totstroke = 0;
+  BLI_listbase_clear(&old_gpd->layers);
+  old_gpd->totlayer = old_gpd->totframe = old_gpd->totstroke = 0;
 
   int frm_offset{0};
   for (int lay_i = 0; lay_i < new_gpd.layers_size; lay_i++) {
-    bGPDlayer *gpl = reinterpret_cast<bGPDlayer *>(MEM_mallocN(sizeof(bGPDlayer), __func__));
-    const ::GPLayer *lay{new_gpd.layers_array + lay_i};
-    sprintf(gpl->info, "%s", lay->name);
+    bGPDlayer *old_gpl = reinterpret_cast<bGPDlayer *>(MEM_mallocN(sizeof(bGPDlayer), __func__));
+    const ::GPLayer *new_gpl{new_gpd.layers_array + lay_i};
 
-    BLI_listbase_clear(&gpl->mask_layers);
-    BLI_listbase_clear(&gpl->frames);
+    sprintf(old_gpl->info, "%s", new_gpl->name);
+
+    BLI_listbase_clear(&old_gpl->mask_layers);
+    BLI_listbase_clear(&old_gpl->frames);
 
     /* Add frames of correct layer index.
        Assumes that frames in new data structure are sorted by layer index.
@@ -50,21 +52,21 @@ bGPdata *convert_new_to_old_gpencil_data(const GPData &new_gpd)
     while ((frm_offset < new_gpd.frames_size) &&
            (new_gpd.frames_array[frm_offset].layer_index == lay_i)) {
       bGPDframe *gpf = reinterpret_cast<bGPDframe *>(MEM_mallocN(sizeof(bGPDframe), __func__));
-      const ::GPFrame *frm{new_gpd.frames_array + frm_offset};
-      gpf->framenum = frm->start_time;
+      const ::GPFrame *new_gpf{new_gpd.frames_array + frm_offset};
+      gpf->framenum = new_gpf->start_time;
 
       BLI_listbase_clear(&gpf->strokes);
 
-      ++(gpd->totframe);
-      BLI_addtail(&gpl->frames, gpf);
+      ++(old_gpd->totframe);
+      BLI_addtail(&old_gpl->frames, gpf);
       ++frm_offset;
     }
 
-    ++(gpd->totlayer);
-    BLI_addtail(&gpd->layers, gpl);
+    ++(old_gpd->totlayer);
+    BLI_addtail(&old_gpd->layers, old_gpl);
   }
 
-  return gpd;
+  return old_gpd;
 }
 
 }  // namespace blender::bke
\ No newline at end of file