[Bf-blender-cvs] [39419bf99f0] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into lanpr-under-gp

[YimingWu]

Commit: 39419bf99f04134bb1190a29a4ac9eb7c406252f
Author: YimingWu
Date:   Sat Jun 27 11:52:29 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB39419bf99f04134bb1190a29a4ac9eb7c406252f

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 658a2071ddf,82b6b25a679..25bc9dff066
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -10793,14 -10741,12 +10790,14 @@@ static void expand_collection(BlendExpa
    }
  
    LISTBASE_FOREACH (CollectionChild *, child, &collection->children) {
-     expand_doit(fd, mainvar, child->collection);
+     BLO_expand(expander, child->collection);
    }
  
 +  expand_doit(fd, mainvar, collection->lanpr->target);
 +
  #ifdef USE_COLLECTION_COMPAT_28
    if (collection->collection != NULL) {
-     expand_scene_collection(fd, mainvar, collection->collection);
+     expand_scene_collection(expander, collection->collection);
    }
  #endif
  }
@@@ -11217,14 -11125,8 +11176,14 @@@ static void expand_scene(BlendExpander 
      }
    }
  
 +  for (LANPR_LineLayer *ll = sce->lanpr.line_layers.first; ll; ll = ll->next) {
 +    if (ll->normal_control_object) {
 +      expand_doit(fd, mainvar, ll->normal_control_object);
 +    }
 +  }
 +
    if (sce->gpd) {
-     expand_doit(fd, mainvar, sce->gpd);
+     BLO_expand(expander, sce->gpd);
    }
  
    if (sce->ed) {