Merged changes in the trunk up to revision 55357.
[blender-staging.git] / source / blender / makesrna / intern / rna_main.c
index 75b7655006ff17a479db3c128b6d55769c9b72e7..06a7b4aa11be957d30b2d596bc6530ec82dc994a 100644 (file)
@@ -259,6 +259,14 @@ static void rna_Main_masks_begin(CollectionPropertyIterator *iter, PointerRNA *p
        rna_iterator_listbase_begin(iter, &bmain->mask, NULL);
 }
 
+#ifdef WITH_FREESTYLE
+static void rna_Main_linestyle_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
+{
+       Main *bmain = (Main*)ptr->data;
+       rna_iterator_listbase_begin(iter, &bmain->linestyle, NULL);
+}
+#endif
+
 #ifdef UNIT_TEST
 
 static PointerRNA rna_Test_test_get(PointerRNA *ptr)
@@ -323,6 +331,9 @@ void RNA_def_main(BlenderRNA *brna)
                {"grease_pencil", "GreasePencil", "rna_Main_gpencil_begin", "Grease Pencil", "Grease Pencil datablocks", RNA_def_main_gpencil},
                {"movieclips", "MovieClip", "rna_Main_movieclips_begin", "Movie Clips", "Movie Clip datablocks", RNA_def_main_movieclips},
                {"masks", "Mask", "rna_Main_masks_begin", "Masks", "Masks datablocks", RNA_def_main_masks},
+#ifdef WITH_FREESTYLE
+               {"linestyles", "FreestyleLineStyle", "rna_Main_linestyle_begin", "Line Styles", "Line Style datablocks", RNA_def_main_linestyles},
+#endif
                {NULL, NULL, NULL, NULL, NULL, NULL}
        };