[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17670] branches/blender2.5/blender: RNA
Andrea Weikert
elubie at gmx.net
Mon Dec 1 22:23:59 CET 2008
Revision: 17670
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17670
Author: elubie
Date: 2008-12-01 22:23:58 +0100 (Mon, 01 Dec 2008)
Log Message:
-----------
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 :)
Modified Paths:
--------------
branches/blender2.5/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/blender2.5/blender/source/blender/makesdna/DNA_packedFile_types.h
branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
Added Paths:
-----------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_packedfile.c
Modified: branches/blender2.5/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
--- branches/blender2.5/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2008-12-01 21:19:36 UTC (rev 17669)
+++ branches/blender2.5/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2008-12-01 21:23:58 UTC (rev 17670)
@@ -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>
Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_packedFile_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_packedFile_types.h 2008-12-01 21:19:36 UTC (rev 17669)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_packedFile_types.h 2008-12-01 21:23:58 UTC (rev 17670)
@@ -36,8 +36,6 @@
typedef struct PackedFile {
int size;
int seek;
- int flags;
- int pad;
void * data;
} PackedFile;
@@ -60,3 +58,4 @@
#endif /* PACKEDFILE_TYPES_H */
+
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2008-12-01 21:19:36 UTC (rev 17669)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2008-12-01 21:23:58 UTC (rev 17670)
@@ -97,6 +97,7 @@
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 @@
#endif /* RNA_ACCESS */
+
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c 2008-12-01 21:19:36 UTC (rev 17669)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c 2008-12-01 21:23:58 UTC (rev 17670)
@@ -894,6 +894,7 @@
{"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 @@
return return_status;
}
+
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c 2008-12-01 21:19:36 UTC (rev 17669)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c 2008-12-01 21:23:58 UTC (rev 17670)
@@ -128,7 +128,7 @@
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 @@
#endif
+
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h 2008-12-01 21:19:36 UTC (rev 17669)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h 2008-12-01 21:23:58 UTC (rev 17670)
@@ -101,6 +101,7 @@
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 @@
#endif /* RNA_INTERNAL_H */
+
Added: branches/blender2.5/blender/source/blender/makesrna/intern/rna_packedfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_packedfile.c (rev 0)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_packedfile.c 2008-12-01 21:23:58 UTC (rev 17670)
@@ -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
+
Property changes on: branches/blender2.5/blender/source/blender/makesrna/intern/rna_packedfile.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
More information about the Bf-blender-cvs
mailing list