Moved unpack_method_items to the right place.
authorJoerg Mueller <nexyon@gmail.com>
Fri, 28 Aug 2009 20:41:12 +0000 (20:41 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Fri, 28 Aug 2009 20:41:12 +0000 (20:41 +0000)
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_packedfile.c

index 7a39cd587eb761d80d3347b94f8d108b6c0362e8..bee06e6892f1432cba182ab3610cdb51b122912e 100644 (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;
index 06be0e69be57ef9b19866056a02bf8e96c6c44f7..3bba474677f8541a582436cfe7807b9dfdbf63b3 100644 (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 */
 
 
index 6b9a708f555075157c384264d6e8538b6075b88c..85918bce05b2eedbd1b51d5810de3ac0bbe65c2c 100644 (file)
 
 #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