Commit: 18f637230debdc83ea71e0bc26788b65d1498f4f
Author: Antonio Vazquez
Date: Fri Aug 28 16:52:15 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB18f637230debdc83ea71e0bc26788b65d1498f4f
Merge branch 'master' into greasepencil-edit-curve
Conflicts:
source/blender/blenloader/intern/writefile.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/writefile.c
index c3fba656d34,a9c92719a33..f3616460d8f
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -2529,14 -2309,7 +2309,14 @@@ static void write_gpencil(BlendWriter *
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);
+ if (gps->editcurve != NULL) {
+ BLO_write_struct(writer, bGPDcurve, gps->editcurve);
+ BLO_write_struct_array(writer,
+ bGPDcurve_point,
+ gps->editcurve->tot_curve_points,
+ gps->editcurve->curve_points);
+ }
- write_dverts(writer, gps->totpoints, gps->dvert);
+ BKE_defvert_blend_write(writer, gps->totpoints, gps->dvert);
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
