griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Moved unpack_method_items to the right place.

Browse Source
This commit is contained in:
Joerg Mueller
2009-08-28 20:41:12 +00:00
parent 9781320716
commit a179d16550
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_image/image_ops.c
View File

@@ -61,6 +61,7 @@
#include "RNA_access.h"
#include "RNA_define.h"
#include "RNA_types.h"
#include "RNA_enum_types.h"
#include "ED_image.h"
#include "ED_screen.h"
@@ -1166,15 +1167,6 @@ void IMAGE_OT_pack(wmOperatorType *ot)
/********************* unpack operator *********************/
/* XXX move this to some place where it can be reused */
const EnumPropertyItem unpack_method_items[] = {
{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", ""},
{PF_WRITE_ORIGINAL, "WRITE_ORIGINAL", 0, "Write Original File (overwrite existing)", ""},
{0, NULL, 0, NULL, NULL}};
void unpack_menu(bContext *C, char *opname, char *abs_name, char *folder, PackedFile *pf)
{
uiPopupMenu *pup;

2
source/blender/makesrna/RNA_enum_types.h
View File

@@ -53,6 +53,8 @@ extern EnumPropertyItem event_type_items[];
extern EnumPropertyItem brush_sculpt_tool_items[];
extern EnumPropertyItem unpack_method_items[];
#endif /* RNA_ENUM_TYPES */

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

@@ -31,6 +31,13 @@
#include "DNA_packedFile_types.h"
EnumPropertyItem unpack_method_items[] = {
{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", ""},
{PF_WRITE_ORIGINAL, "WRITE_ORIGINAL", 0, "Write Original File (overwrite existing)", ""},
{0, NULL, 0, NULL, NULL}};
#ifdef RNA_RUNTIME
#else