Commit: f33c3d157c21e82dc5f9916205191680c8f1bc10
Author: Nick Wu
Date: Tue Aug 28 16:07:17 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBf33c3d157c21e82dc5f9916205191680c8f1bc10
Fixed dropdown list reference lost issue.
===================================================================
M source/blender/blenloader/intern/readfile.c
M source/blender/makesdna/DNA_lanpr_types.h
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index abfba8ec8bf..2bf211da431 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6524,8 +6524,14 @@ static void direct_link_scene(FileData *fd, Scene *sce)
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 = newdataadr(fd, llc->object_select);
+ llc->material_select = newdataadr(fd,
llc->material_select);
+ llc->collection_select = newdataadr(fd,
llc->collection_select);
+ }
ll->batch = NULL;
ll->shgrp = NULL;
+ ll->normal_control_object = newdataadr(fd,
ll->normal_control_object);
}
sce->layer_properties = newdataadr(fd, sce->layer_properties);
diff --git a/source/blender/makesdna/DNA_lanpr_types.h
b/source/blender/makesdna/DNA_lanpr_types.h
index b457b88d048..3040bc0b992 100644
--- a/source/blender/makesdna/DNA_lanpr_types.h
+++ b/source/blender/makesdna/DNA_lanpr_types.h
@@ -116,6 +116,7 @@ typedef struct LANPR_LineLayer {
float normal_ramp_end;
float normal_thickness_begin;
float normal_thickness_end;
+ struct Object *normal_control_object;
int logic_mode; /* for component evaluation */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
