[Bf-blender-cvs] [42deaa360ec] temp-lanpr-cleanup2: LANPR: Remove redundant libaddr code in readfile.c

[YimingWu]

Commit: 42deaa360ecd18a5967f54cbbde744d2c2b13dfa
Author: YimingWu
Date:   Mon Nov 4 22:25:19 2019 +0800
Branches: temp-lanpr-cleanup2
https://developer.blender.org/rB42deaa360ecd18a5967f54cbbde744d2c2b13dfa

LANPR: Remove redundant libaddr code in readfile.c

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

M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index f8220273c3b..665b1f2b2d2 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7006,21 +7006,6 @@ static void direct_link_scene(FileData *fd, Scene *sce)
     }
   }
 
-  /* LANPR things */
-  sce->lanpr.active_layer = newdataadr(fd, sce->lanpr.active_layer);
-  link_list(fd, &sce->lanpr.line_layers);
-  for (LANPR_LineLayer *ll = sce->lanpr.line_layers.first; ll; ll = ll->next) {
-    link_list(fd, &ll->components);
-    for (LANPR_LineLayerComponent *llc = ll->components.first; llc; llc = llc->next) {
-      // llc->object_select = newlibadr(fd, sce->id.lib, llc->object_select);
-      // llc->material_select = newlibadr(fd, sce->id.lib, llc->material_select);
-      // llc->collection_select = newlibadr(fd, sce->id.lib, llc->collection_select);
-    }
-    ll->batch = NULL;
-    ll->shgrp = NULL;
-    // ll->normal_control_object = newlibadr(fd, sce->id.lib, ll->normal_control_object);
-  }
-
   direct_link_view3dshading(fd, &sce->display.shading);
 
   sce->layer_properties = newdataadr(fd, sce->layer_properties);
@@ -10882,19 +10867,24 @@ static void expand_scene(FileData *fd, Main *mainvar, Scene *sce)
 
   for (LANPR_LineLayer *ll = sce->lanpr.line_layers.first; ll; ll = ll->next) {
     for (LANPR_LineLayerComponent *llc = ll->components.first; llc; llc = llc->next) {
-      if (llc->object_select)
+      if (llc->object_select) {
         expand_doit(fd, mainvar, llc->object_select);
-      if (llc->material_select)
+      }
+      if (llc->material_select) {
         expand_doit(fd, mainvar, llc->material_select);
-      if (llc->collection_select)
+      }
+      if (llc->collection_select) {
         expand_doit(fd, mainvar, llc->collection_select);
+      }
     }
-    if (ll->normal_control_object)
+    if (ll->normal_control_object) {
       expand_doit(fd, mainvar, ll->normal_control_object);
+    }
   }
 
-  if (sce->gpd)
+  if (sce->gpd) {
     expand_doit(fd, mainvar, sce->gpd);
+  }
 
   if (sce->ed) {
     Sequence *seq;