[Bf-blender-cvs] [d46edf6861a] asset-greasepencil: Merge branch 'master' into asset-greasepencil

[Antonio Vazquez]

Commit: d46edf6861a5e43b2f13d65f7d5ffc7dfcde27cd
Author: Antonio Vazquez
Date:   Thu Aug 26 15:42:34 2021 +0200
Branches: asset-greasepencil
https://developer.blender.org/rBd46edf6861a5e43b2f13d65f7d5ffc7dfcde27cd

Merge branch 'master' into asset-greasepencil

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



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

diff --cc source/blender/blenkernel/intern/gpencil.c
index 22cc937e7e6,a143645c2ee..7df27c0dde0
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@@ -216,12 -207,8 +216,12 @@@ void BKE_gpencil_blend_read_data(BlendD
    BLO_read_data_address(reader, &gpd->adt);
    BKE_animdata_blend_read_data(reader, gpd->adt);
  
 +  /* Preview. */
 +  BLO_read_data_address(reader, &gpd->preview);
 +  BKE_previewimg_blend_read(reader, gpd->preview);
 +
    /* Ensure full objectmode for linked grease pencil. */
-   if (gpd->id.lib != NULL) {
+   if (ID_IS_LINKED(gpd)) {
      gpd->flag &= ~GP_DATA_STROKE_PAINTMODE;
      gpd->flag &= ~GP_DATA_STROKE_EDITMODE;
      gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE;