Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesrna/intern/rna_vfont_api.c')
-rw-r--r--source/blender/makesrna/intern/rna_vfont_api.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_vfont_api.c b/source/blender/makesrna/intern/rna_vfont_api.c
index 6a2a7f3ffad..b93fc1a0053 100644
--- a/source/blender/makesrna/intern/rna_vfont_api.c
+++ b/source/blender/makesrna/intern/rna_vfont_api.c
@@ -43,14 +43,14 @@ static void rna_VectorFont_pack(VFont *vfont, Main *bmain, ReportList *reports)
vfont->packedfile = newPackedFile(reports, vfont->name, ID_BLEND_PATH(bmain, &vfont->id));
}
-static void rna_VectorFont_unpack(VFont *vfont, ReportList *reports, int method)
+static void rna_VectorFont_unpack(VFont *vfont, Main *bmain, ReportList *reports, int method)
{
if (!vfont->packedfile) {
BKE_report(reports, RPT_ERROR, "Font not packed");
}
else {
/* reports its own error on failure */
- unpackVFont(reports, vfont, method);
+ unpackVFont(bmain, reports, vfont, method);
}
}
@@ -62,11 +62,11 @@ void RNA_api_vfont(StructRNA *srna)
func = RNA_def_function(srna, "pack", "rna_VectorFont_pack");
RNA_def_function_ui_description(func, "Pack the font into the current blend file");
- RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_MAIN);
+ RNA_def_function_flag(func, FUNC_USE_MAIN | FUNC_USE_REPORTS);
func = RNA_def_function(srna, "unpack", "rna_VectorFont_unpack");
RNA_def_function_ui_description(func, "Unpack the font to the samples filename");
- RNA_def_function_flag(func, FUNC_USE_REPORTS);
+ RNA_def_function_flag(func, FUNC_USE_MAIN | FUNC_USE_REPORTS);
RNA_def_enum(func, "method", rna_enum_unpack_method_items, PF_USE_LOCAL, "method", "How to unpack");
}