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

[Antonio Vazquez]

Commit: f99d2e8068d303be2d36d5d280c960f9259c7122
Author: Antonio Vazquez
Date:   Sun Jun 7 15:57:34 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rBf99d2e8068d303be2d36d5d280c960f9259c7122

GPencil: Fix merge errors

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

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

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 7d796cdef25..6588db6048a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7177,10 +7177,10 @@ static void direct_link_gpencil(BlendDataReader *reader, bGPdata *gpd)
         BLO_read_data_address(reader, &gps->triangles);
 
         /* relink stroke edit curve. */
-        gps->editcurve = newdataadr(fd, gps->editcurve);
+        BLO_read_data_address(reader, &gps->editcurve);
         if (gps->editcurve != NULL) {
-          gps->editcurve->curve_points = newdataadr(fd, gps->editcurve->curve_points);
-          gps->editcurve->point_index_array = newdataadr(fd, gps->editcurve->point_index_array);
+          BLO_read_data_address(reader, &gps->editcurve->curve_points);
+          BLO_read_data_address(reader, &gps->editcurve->point_index_array);
         }
 
         /* relink weight data */