[Bf-blender-cvs] [e7aa313ffea] gpencil-new-data-proposal: minor fix, no functional change

Amelie Fondevilla noreply at git.blender.org
Mon Dec 5 17:47:19 CET 2022


Commit: e7aa313ffea0998d3231cabc2c3d3a2d4fd06cc1
Author: Amelie Fondevilla
Date:   Mon Dec 5 15:29:44 2022 +0100
Branches: gpencil-new-data-proposal
https://developer.blender.org/rBe7aa313ffea0998d3231cabc2c3d3a2d4fd06cc1

minor fix, no functional change

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

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 02513b45171..ccd71823821 100644
--- a/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
+++ b/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
@@ -42,7 +42,6 @@ bGPdata *convert_new_to_old_gpencil_data(const GPData &new_gpd)
   gpd->totlayer = gpd->totframe = gpd->totstroke = 0;
 
   int frm_offset{0};
-  gpd->totlayer = new_gpd.layers_size;
   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};
@@ -50,7 +49,6 @@ bGPdata *convert_new_to_old_gpencil_data(const GPData &new_gpd)
 
     BLI_listbase_clear(&gpl->mask_layers);
     BLI_listbase_clear(&gpl->frames);
-    BLI_addtail(&gpd->layers, gpl);
 
     /* Add frames of correct layer index.
        Assumes that frames in new data structure are sorted by layer index.
@@ -63,10 +61,13 @@ bGPdata *convert_new_to_old_gpencil_data(const GPData &new_gpd)
 
       BLI_listbase_clear(&gpf->strokes);
 
-      BLI_addtail(&gpl->frames, gpf);
       ++(gpd->totframe);
+      BLI_addtail(&gpl->frames, gpf);
       ++frm_offset;
     }
+
+    ++(gpd->totlayer);
+    BLI_addtail(&gpd->layers, gpl);
   }
 
   return gpd;



More information about the Bf-blender-cvs mailing list