[Bf-blender-cvs] [6dc2ac9ecf6] greasepencil-edit-curve: GPencil: Fix merge errors

[Antonio Vazquez]

Commit: 6dc2ac9ecf602a875391ad14cd07b9a18c9f833c
Author: Antonio Vazquez
Date:   Fri Jun 5 15:24:15 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB6dc2ac9ecf602a875391ad14cd07b9a18c9f833c

GPencil: Fix merge errors

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

M	source/blender/blenloader/intern/writefile.c

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

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 161296256dd..275f219edea 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2905,16 +2905,9 @@ static void write_gpencil(BlendWriter *writer, bGPdata *gpd, const void *id_addr
         /* write strokes */
         BLO_write_struct_list(writer, bGPDstroke, &gpf->strokes);
         LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
-          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);
+          BLO_write_struct(writer, bGPDspoint, gps->points);
+          BLO_write_struct(writer, bGPDtriangle, gps->triangles);
+          write_dverts(writer->wd, gps->totpoints, gps->dvert);
         }
       }
     }