[Bf-blender-cvs] [2c4a1fc84d1] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 2c4a1fc84d1e9df2107d8d5229f64efe124afb71
Author: Antonio Vazquez
Date:   Fri Jun 5 15:14:10 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB2c4a1fc84d1e9df2107d8d5229f64efe124afb71

Merge branch 'master' into greasepencil-edit-curve

 Conflicts:
	source/blender/blenloader/intern/writefile.c

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index 9de50e3e9bd,e7bae740e4f..161296256dd
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -2871,36 -2885,29 +2885,36 @@@ static void write_gpencil(BlendWriter *
      gpd->runtime.tot_cp_points = 0;
  
      /* write gpd data block to file */
-     writestruct_at_address(wd, ID_GD, bGPdata, 1, id_address, gpd);
-     write_iddata(wd, &gpd->id);
+     BLO_write_id_struct(writer, bGPdata, id_address, &gpd->id);
+     write_iddata(writer, &gpd->id);
  
      if (gpd->adt) {
-       write_animdata(wd, gpd->adt);
+       write_animdata(writer->wd, gpd->adt);
      }
  
-     writedata(wd, DATA, sizeof(void *) * gpd->totcol, gpd->mat);
+     BLO_write_pointer_array(writer, gpd->totcol, gpd->mat);
  
      /* write grease-pencil layers to file */
-     writelist(wd, DATA, bGPDlayer, &gpd->layers);
+     BLO_write_struct_list(writer, bGPDlayer, &gpd->layers);
      LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
        /* Write mask list. */
-       writelist(wd, DATA, bGPDlayer_Mask, &gpl->mask_layers);
+       BLO_write_struct_list(writer, bGPDlayer_Mask, &gpl->mask_layers);
        /* write this layer's frames to file */
-       writelist(wd, DATA, bGPDframe, &gpl->frames);
+       BLO_write_struct_list(writer, bGPDframe, &gpl->frames);
        LISTBASE_FOREACH (bGPDframe *, gpf, &gpl->frames) {
          /* write strokes */
-         writelist(wd, DATA, bGPDstroke, &gpf->strokes);
+         BLO_write_struct_list(writer, bGPDstroke, &gpf->strokes);
          LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
 -          BLO_write_struct_array(writer, bGPDspoint, gps->totpoints, gps->points);
 -          BLO_write_struct_array(writer, bGPDtriangle, gps->tot_triangles, gps->triangles);
 -          write_dverts(writer->wd, gps->totpoints, gps->dvert);
 +          writestruct(wd, DATA, bGPDspoint, gps->totpoints, gps->points);
 +          writestruct(wd, DATA, bGPDtriangle, gps->tot_triangles, gps->triangles);
 +          writestruct(wd, DATA, bGPDcurve, 1, gps->editcurve);
 +          if (gps->editcurve != NULL) {
 +            writedata(wd,
 +                      DATA,
 +                      sizeof(int *) * gps->editcurve->tot_index_array,
 +                      gps->editcurve->point_index_array);
 +          }
 +          write_dverts(wd, gps->totpoints, gps->dvert);
          }
        }
      }