[Bf-blender-cvs] [c9ebd5fc16a] greasepencil-refactor: Merge branch 'greasepencil-object' into greasepencil-refactor

[Antonio Vazquez]

Commit: c9ebd5fc16a33669dd8b8cc74b52298616ec42f1
Author: Antonio Vazquez
Date:   Fri Feb 7 16:38:21 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rBc9ebd5fc16a33669dd8b8cc74b52298616ec42f1

Merge branch 'greasepencil-object' into greasepencil-refactor

 Conflicts:
	source/blender/blenloader/intern/readfile.c

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index da2ef97570d,9c7e4a35e1f..37fcf10e553
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -6941,7 -6928,7 +6928,7 @@@ static void lib_link_gpencil(FileData *
  {
    /* Relink all data-lock linked by GP data-lock */
    /* Layers */
-     LISTBASE_FOREACH(bGPDlayer*, gpl, &gpd->layers) {
 -  for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
++  LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
      /* Layer -> Parent References */
      gpl->parent = newlibadr(fd, gpd->id.lib, gpl->parent);
    }
@@@ -10963,11 -10879,7 +10868,7 @@@ static void expand_linestyle(FileData *
  
  static void expand_gpencil(FileData *fd, Main *mainvar, bGPdata *gpd)
  {
-   if (gpd->adt) {
-     expand_animdata(fd, mainvar, gpd->adt);
-   }
- 
 -  for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
 +  LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
      expand_doit(fd, mainvar, gpl->parent);
    }