blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Merge branch 'blender-v2.81-release'

This commit is contained in:
Philipp Oeser 2019-10-29 14:32:28 +01:00
parent e2240d9fc1 9efe12d77a
commit c43183bcc9
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/space_info/info_ops.c
View File

@ -211,6 +211,7 @@ static const EnumPropertyItem unpack_all_method_items[] = {
"Write files to original location (overwrite existing files)",
""},
{PF_KEEP, "KEEP", 0, "Disable Auto-pack, keep all packed files", ""},
{PF_REMOVE, "REMOVE", 0, "Remove Pack", ""},
/* {PF_ASK, "ASK", 0, "Ask for each file", ""}, */
{0, NULL, 0, NULL, NULL},
};

1
source/blender/makesrna/intern/rna_packedfile.c
View File

@ -32,6 +32,7 @@
#include "rna_internal.h"
const EnumPropertyItem rna_enum_unpack_method_items[] = {
{PF_REMOVE, "REMOVE", 0, "Remove Pack", ""},
{PF_USE_LOCAL, "USE_LOCAL", 0, "Use Local File", ""},
{PF_WRITE_LOCAL, "WRITE_LOCAL", 0, "Write Local File (overwrite existing)", ""},
{PF_USE_ORIGINAL, "USE_ORIGINAL", 0, "Use Original File", ""},