RNA

* DNA_lattice_types: added rna definitions for lattice u,v,w and some flags
* updated MSVC projectfiles

diff --git a/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj b/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
index f301e852e5c0aed4286fdc4c2c2df1c4d191e395..4af60362c2168032d45232fa8309719b86798724 100644 (file)
--- a/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
+++ b/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
@@ -600,6 +600,10 @@
                                RelativePath="..\..\..\source\blender\makesrna\intern\rna_color.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\source\blender\makesrna\intern\rna_controller.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\makesrna\intern\rna_define.c"\r
                                >\r
@@ -616,6 +620,10 @@
                                RelativePath="..\..\..\source\blender\makesrna\intern\rna_lamp.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\source\blender\makesrna\intern\rna_lattice.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\makesrna\intern\rna_main.c"\r
                                >\r
@@ -636,6 +644,10 @@
                                RelativePath="..\..\..\source\blender\makesrna\intern\rna_object.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\source\blender\makesrna\intern\rna_radio.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\makesrna\intern\rna_rna.c"\r
                                >\r

diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 712a6f5873d60db706cee5f4353931015e8a9fef..b4c68ffcb3dc6cbfb210ecc98a75a85063f5251d 100644 (file)
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -103,6 +103,8 @@ extern StructRNA RNA_TouchSensor;
 extern StructRNA RNA_UnknownType;
 extern StructRNA RNA_WindowManager;
 
+extern StructRNA RNA_Lattice;
+
 /* Pointer
  *
  * These functions will fill in RNA pointers, this can be done in three ways:

diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 576f68d7bf3ad2cc9037e5729faf54e372c5d8bf..8e75fcdbd040b7b55b67083ec2069b05ae23ee7f 100644 (file)
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -881,6 +881,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
        {"rna_controller.c", RNA_def_controller},
        {"rna_group.c", RNA_def_group},
        {"rna_lamp.c", RNA_def_lamp},
+       {"rna_lattice.c", RNA_def_lattice},
        {"rna_main.c", RNA_def_main},
        {"rna_material.c", RNA_def_material},
        {"rna_mesh.c", RNA_def_mesh},
@@ -891,7 +892,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
        {"rna_scene.c", RNA_def_scene},
        {"rna_screen.c", RNA_def_screen},
        {"rna_sensor.c", RNA_def_sensor},
-       {"rna_wm.c", RNA_def_wm},
+       {"rna_wm.c", RNA_def_wm},       
        {NULL, NULL}};
 
 static int rna_preprocess(char *basedirectory, FILE *f)

diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 2258888129eda83891fe046bfdf2a8e64c2ad9b6..cf0fe9e35abe55f3320861c3ea832ad6212bb227 100644 (file)
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -62,6 +62,7 @@ static StructRNA *rna_ID_refine(PointerRNA *ptr)
                case ID_GR: return &RNA_Group;
                case ID_LA: return &RNA_Lamp;
                case ID_LI: return &RNA_Library;
+               case ID_LT: return &RNA_Lattice;
                case ID_MA: return &RNA_Material;
                case ID_NT: return &RNA_NodeTree;
                case ID_ME: return &RNA_Mesh;

diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index 8bc52e2cdc6333040456dd8d6f278d3ad308760d..eaaa15d2109c692b005c59dd3f7cd52731ce7397 100644 (file)
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -97,6 +97,7 @@ void RNA_def_scene(struct BlenderRNA *brna);
 void RNA_def_screen(struct BlenderRNA *brna);
 void RNA_def_sensor(struct BlenderRNA *brna);
 void RNA_def_wm(struct BlenderRNA *brna);
+void RNA_def_lattice(struct BlenderRNA *brna);
 
 /* ID Properties */
 

diff --git a/source/blender/makesrna/intern/rna_lattice.c b/source/blender/makesrna/intern/rna_lattice.c
new file mode 100644 (file)
index 0000000..e4e82b3
--- /dev/null
+++ b/source/blender/makesrna/intern/rna_lattice.c
@@ -0,0 +1,87 @@
+/**
+ * $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_lattice_types.h"
+#include "DNA_key_types.h"
+
+#ifdef RNA_RUNTIME
+#else
+
+void RNA_def_lattice(BlenderRNA *brna)
+{
+       StructRNA *srna;
+       PropertyRNA *prop;
+
+       static EnumPropertyItem prop_keyblock_type_items[] = {
+               {KEY_LINEAR, "KEY_LINEAR", "Linear", ""},
+               {KEY_CARDINAL, "KEY_CARDINAL", "Cardinal", ""},
+               {KEY_BSPLINE, "KEY_BSPLINE", "BSpline", ""},
+               {0, NULL, NULL, NULL}};
+
+       srna= RNA_def_struct(brna, "Lattice", "ID", "Lattice");
+
+       prop= RNA_def_property(srna, "points_u", PROP_INT, PROP_NONE);
+       RNA_def_property_int_sdna(prop, NULL, "pntsu");
+       RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
+       RNA_def_property_ui_text(prop, "U", "Points in U direction.");
+
+       prop= RNA_def_property(srna, "points_v", PROP_INT, PROP_NONE);
+       RNA_def_property_int_sdna(prop, NULL, "pntsv");
+       RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
+       RNA_def_property_ui_text(prop, "V", "Points in V direction.");
+
+       prop= RNA_def_property(srna, "points_w", PROP_INT, PROP_NONE);
+       RNA_def_property_int_sdna(prop, NULL, "pntsw");
+       RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
+       RNA_def_property_ui_text(prop, "W", "Points in W direction.");
+
+       prop= RNA_def_property(srna, "interpolation_type_u", PROP_ENUM, PROP_NONE);
+       RNA_def_property_enum_sdna(prop, NULL, "typeu", 0);
+       RNA_def_property_enum_items(prop, prop_keyblock_type_items);
+       RNA_def_property_ui_text(prop, "Interpolation Type U", "");
+
+       prop= RNA_def_property(srna, "interpolation_type_v", PROP_ENUM, PROP_NONE);
+       RNA_def_property_enum_sdna(prop, NULL, "typev", 0);
+       RNA_def_property_enum_items(prop, prop_keyblock_type_items);
+       RNA_def_property_ui_text(prop, "Interpolation Type V", "");
+
+       prop= RNA_def_property(srna, "interpolation_type_w", PROP_ENUM, PROP_NONE);
+       RNA_def_property_enum_sdna(prop, NULL, "typew", 0);
+       RNA_def_property_enum_items(prop, prop_keyblock_type_items);
+       RNA_def_property_ui_text(prop, "Interpolation Type W", "");
+
+       prop= RNA_def_property(srna, "outside", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "flag", LT_OUTSIDE);
+       RNA_def_property_ui_text(prop, "Outside", "Only draw, and take into account, the outer vertices.");
+}
+
+#endif
+