[Bf-blender-cvs] [96e1b266586] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 96e1b26658602f44ad940ddd55ede8902691905d
Author: Antonio Vazquez
Date:   Sun Jun 7 13:26:47 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB96e1b26658602f44ad940ddd55ede8902691905d

Merge branch 'master' into greasepencil-edit-curve

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index f412e85a90f,f7f18d98e73..7d796cdef25
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -7305,21 -7172,14 +7172,21 @@@ static void direct_link_gpencil(BlendDa
  
        LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
          /* relink stroke points array */
-         gps->points = newdataadr(fd, gps->points);
+         BLO_read_data_address(reader, &gps->points);
          /* Relink geometry*/
-         gps->triangles = newdataadr(fd, gps->triangles);
+         BLO_read_data_address(reader, &gps->triangles);
  
 +        /* relink stroke edit curve. */
 +        gps->editcurve = newdataadr(fd, 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);
 +        }
 +
          /* relink weight data */
          if (gps->dvert) {
-           gps->dvert = newdataadr(fd, gps->dvert);
-           direct_link_dverts(fd, gps->totpoints, gps->dvert);
+           BLO_read_data_address(reader, &gps->dvert);
+           direct_link_dverts(reader, gps->totpoints, gps->dvert);
          }
        }
      }