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:
authorPhilipp Oeser <info@graphics-engineer.com>2019-10-29 13:33:41 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-10-29 16:30:22 +0300
commit9efe12d77a60fab1215f09c6231337244df3c176 (patch)
tree751fc186e8076123c9d6bd8fbcc34035efbaf051
parent8a5f3d38af9649dbf0ccb7c9d1276be39c3de343 (diff)
Fix T71171: Problems removing texture packing (without writing anything)
using image.unpack() or bpy.ops.image.unpack() If we offer this in the UI, also expose this to .unpack Maniphest Tasks: T71171 Differential Revision: https://developer.blender.org/D6152
-rw-r--r--source/blender/editors/space_info/info_ops.c1
-rw-r--r--source/blender/makesrna/intern/rna_packedfile.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c
index 14817e9ffa1..124e3c08165 100644
--- a/source/blender/editors/space_info/info_ops.c
+++ b/source/blender/editors/space_info/info_ops.c
@@ -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},
};
diff --git a/source/blender/makesrna/intern/rna_packedfile.c b/source/blender/makesrna/intern/rna_packedfile.c
index dda1c637f39..8319612ea91 100644
--- a/source/blender/makesrna/intern/rna_packedfile.c
+++ b/source/blender/makesrna/intern/rna_packedfile.c
@@ -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", ""},