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:
authorAndrea Weikert <elubie@gmx.net>2008-12-02 00:23:58 +0300
committerAndrea Weikert <elubie@gmx.net>2008-12-02 00:23:58 +0300
commit23a77e76885d6833edc3bd69619f17174c23b8ee (patch)
tree2cdc29743e67a4ddc7cbdb498d64652e5655d2e8
parent31ffe5b65e98b8c34b184ad24daa5163d36ba68c (diff)
RNA
* DNA_packedFile_types: added rna definitions for packed files * also experimentally filled in correct struct 'PackedFile' in image rna for testing. * updated MSVC projectfiles (also for rna_curve.c and rna_vfont.c) Note: I removed PackedFile->flags, I did grep through source and a complete recompile of blender trunk svn without them too, so they obviously aren't needed anymore. A bit of cleaning up :)
-rw-r--r--projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj12
-rw-r--r--source/blender/makesdna/DNA_packedFile_types.h3
-rw-r--r--source/blender/makesrna/RNA_access.h2
-rw-r--r--source/blender/makesrna/intern/makesrna.c2
-rw-r--r--source/blender/makesrna/intern/rna_image.c3
-rw-r--r--source/blender/makesrna/intern/rna_internal.h2
-rw-r--r--source/blender/makesrna/intern/rna_packedfile.c51
7 files changed, 72 insertions, 3 deletions
diff --git a/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj b/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
index 9f424d46cdb..8a576c2da6d 100644
--- a/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
+++ b/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
@@ -613,6 +613,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_curve.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_define.c"
>
</File>
@@ -669,6 +673,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_packedfile.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_property.c"
>
</File>
@@ -693,6 +701,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_vfont.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_wm.c"
>
</File>
diff --git a/source/blender/makesdna/DNA_packedFile_types.h b/source/blender/makesdna/DNA_packedFile_types.h
index 2c965c92849..f11c51692e1 100644
--- a/source/blender/makesdna/DNA_packedFile_types.h
+++ b/source/blender/makesdna/DNA_packedFile_types.h
@@ -36,8 +36,6 @@
typedef struct PackedFile {
int size;
int seek;
- int flags;
- int pad;
void * data;
} PackedFile;
@@ -60,3 +58,4 @@ enum PF_FileStatus
#endif /* PACKEDFILE_TYPES_H */
+
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 6912f8f7274..68866b89852 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -97,6 +97,7 @@ extern StructRNA RNA_Node;
extern StructRNA RNA_NodeTree;
extern StructRNA RNA_Object;
extern StructRNA RNA_Operator;
+extern StructRNA RNA_PackedFile;
extern StructRNA RNA_Panel;
extern StructRNA RNA_PointerProperty;
extern StructRNA RNA_Property;
@@ -279,3 +280,4 @@ int RNA_property_is_set(PointerRNA *ptr, const char *name);
#endif /* RNA_ACCESS */
+
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index a1a98a56404..3c174b11834 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -894,6 +894,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
{"rna_modifier.c", RNA_def_modifier},
{"rna_nodetree.c", RNA_def_nodetree},
{"rna_object.c", RNA_def_object},
+ {"rna_packedfile.c", RNA_def_packedfile},
{"rna_property.c", RNA_def_gameproperty},
{"rna_radio.c", RNA_def_radio},
{"rna_rna.c", RNA_def_rna},
@@ -1016,3 +1017,4 @@ int main(int argc, char **argv)
return return_status;
}
+
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index 8166d0aa11e..17a0f9eadcd 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -128,7 +128,7 @@ static void rna_def_image(BlenderRNA *brna)
prop= RNA_def_property(srna, "packed_file", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "packedfile");
- RNA_def_property_struct_type(prop, "UnknownType");
+ RNA_def_property_struct_type(prop, "PackedFile");
RNA_def_property_ui_text(prop, "Packed File", "");
/* booleans */
@@ -228,3 +228,4 @@ void RNA_def_image(BlenderRNA *brna)
#endif
+
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index 508390e5166..1a893845173 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -101,6 +101,7 @@ void RNA_def_meta(struct BlenderRNA *brna);
void RNA_def_modifier(struct BlenderRNA *brna);
void RNA_def_nodetree(struct BlenderRNA *brna);
void RNA_def_object(struct BlenderRNA *brna);
+void RNA_def_packedfile(struct BlenderRNA *brna);
void RNA_def_radio(struct BlenderRNA *brna);
void RNA_def_rna(struct BlenderRNA *brna);
void RNA_def_scene(struct BlenderRNA *brna);
@@ -170,3 +171,4 @@ void rna_freelistN(struct ListBase *listbase);
#endif /* RNA_INTERNAL_H */
+
diff --git a/source/blender/makesrna/intern/rna_packedfile.c b/source/blender/makesrna/intern/rna_packedfile.c
new file mode 100644
index 00000000000..0bbdd5bfd8c
--- /dev/null
+++ b/source/blender/makesrna/intern/rna_packedfile.c
@@ -0,0 +1,51 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Contributor(s): Blender Foundation (2008).
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+
+#include "RNA_define.h"
+#include "RNA_types.h"
+
+#include "rna_internal.h"
+
+#include "DNA_packedFile_types.h"
+
+#ifdef RNA_RUNTIME
+#else
+
+void RNA_def_packedfile(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+
+ srna= RNA_def_struct(brna, "PackedFile", NULL, "Packed File");
+
+ prop= RNA_def_property(srna, "size", PROP_INT, PROP_NONE);
+ RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
+ RNA_def_property_ui_text(prop, "Size", "Size of Packed File.");
+
+}
+
+#endif
+