[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22845] branches/blender2.5/blender/source /blender: Moved unpack_method_items to the right place.

[Joerg Mueller]

Revision: 22845
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22845
Author:   nexyon
Date:     2009-08-28 22:41:12 +0200 (Fri, 28 Aug 2009)

Log Message:
-----------
Moved unpack_method_items to the right place.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c
    branches/blender2.5/blender/source/blender/makesrna/RNA_enum_types.h
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_packedfile.c

Modified: branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c	2009-08-28 15:54:15 UTC (rev 22844)
+++ branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c	2009-08-28 20:41:12 UTC (rev 22845)
@@ -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 @@
 
 /********************* 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;

Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_enum_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_enum_types.h	2009-08-28 15:54:15 UTC (rev 22844)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_enum_types.h	2009-08-28 20:41:12 UTC (rev 22845)
@@ -53,6 +53,8 @@
 
 extern EnumPropertyItem brush_sculpt_tool_items[];
 
+extern EnumPropertyItem unpack_method_items[];
+
 #endif /* RNA_ENUM_TYPES */
 
 

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_packedfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_packedfile.c	2009-08-28 15:54:15 UTC (rev 22844)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_packedfile.c	2009-08-28 20:41:12 UTC (rev 22845)
@@ -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