[Bf-blender-cvs] [40b22632848] soc-2018-npr: Fixed save/reading error on line style thing...

[Nick Wu]

Commit: 40b22632848af2f60f7bf44b955ff9f1a175c683
Author: Nick Wu
Date:   Thu Jun 28 09:31:18 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB40b22632848af2f60f7bf44b955ff9f1a175c683

Fixed save/reading error on line style thing...

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

M       source/blender/makesdna/DNA_lanpr_types.h
M       source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/makesdna/DNA_lanpr_types.h 
b/source/blender/makesdna/DNA_lanpr_types.h
index 022feefcd15..cb50e709d39 100644
--- a/source/blender/makesdna/DNA_lanpr_types.h
+++ b/source/blender/makesdna/DNA_lanpr_types.h
@@ -64,6 +64,7 @@ struct Collection;
 struct DRWShadingGroup;
 
 typedef struct LANPR_LineStyleComponent{
+    //struct ID Item;
     struct LANPR_LineStyleComponent *next, *prev;
 
     struct Object     *object_select;
@@ -76,6 +77,7 @@ typedef struct LANPR_LineStyleComponent{
 }LANPR_LineStyleComponent;
 
 typedef struct LANPR_LineLayer{
+    //struct ID Item;
     struct LANPR_LineLayer *next, *prev;
 
        int      what;
diff --git a/source/blender/makesrna/intern/rna_scene.c 
b/source/blender/makesrna/intern/rna_scene.c
index 6f633ca2e20..4cb3afebf79 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -6454,7 +6454,7 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
        /* here's the collection stuff.... */
 
        prop = RNA_def_property(srna, "layers", PROP_COLLECTION, PROP_NONE);
-       RNA_def_property_collection_sdna(prop, "SceneLANPR", "line_layers", 
NULL);
+       RNA_def_property_collection_sdna(prop, NULL, "line_layers", NULL);
        RNA_def_property_struct_type(prop, "LANPR_LineLayer");
        RNA_def_property_ui_text(prop, "Line Layers", "LANPR Line Layers");
 
@@ -6464,7 +6464,6 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
        RNA_def_struct_sdna(srna, "SceneLANPR");
        RNA_def_struct_ui_text(srna, "LANPR Line Layers", "");
 
-    /* this part when accessing in python using lanpr.layers.active_layer 
always return None */
        prop = RNA_def_property(srna, "active_layer", PROP_POINTER, PROP_NONE);
        RNA_def_property_struct_type(prop, "LANPR_LineLayer");
        RNA_def_property_pointer_funcs(prop, "rna_lanpr_active_line_layer_get", 
"rna_lanpr_active_line_layer_set", NULL, NULL);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs