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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2008-11-18 13:57:06 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2008-11-18 13:57:06 +0300
commitc3da1af01c1584a8e23b9c6875bcb784fec00ed5 (patch)
tree61e48addc8f47b0317d7a285541f64d855d4bbfb /source/blender/makesrna/intern/rna_main.c
parent8c84a4338597b8b17bca5b1ffbe819f6d71fbf83 (diff)
RNA minor changes
* Added start of lamp wrapping (code by Michael Fox). * Add back Object.data, was crashing with unknown data type. * Added support for using consecutive variables like float r, g, b; as an array without writing a manual get/set function. * Also note the RNA documentation is updated now to be more about how to define RNA and use it, including some diagrams. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA
Diffstat (limited to 'source/blender/makesrna/intern/rna_main.c')
-rw-r--r--source/blender/makesrna/intern/rna_main.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c
index 622e727b2c6..1ffba247dfc 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -46,6 +46,12 @@ static void rna_Main_object_begin(CollectionPropertyIterator *iter, PointerRNA *
rna_iterator_listbase_begin(iter, &bmain->object);
}
+static void rna_Main_lamp_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
+{
+ Main *bmain= (Main*)ptr->data;
+ rna_iterator_listbase_begin(iter, &bmain->lamp);
+}
+
#if 0
static void rna_Main_library_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
@@ -97,11 +103,7 @@ static void rna_Main_latt_begin(CollectionPropertyIterator *iter, PointerRNA *pt
rna_iterator_listbase_begin(iter, &bmain->latt);
}
-static void rna_Main_lamp_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
-{
- Main *bmain= (Main*)ptr->data;
- rna_iterator_listbase_begin(iter, &bmain->lamp);
-}
+
static void rna_Main_camera_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
@@ -210,6 +212,7 @@ void RNA_def_main(BlenderRNA *brna)
{"scenes", "Scene", "rna_Main_scene_begin", "Scenes", "Scene datablocks."},
{"objects", "Object", "rna_Main_object_begin", "Objects", "Object datablocks."},
{"meshes", "Mesh", "rna_Main_mesh_begin", "Meshes", "Mesh datablocks."},
+ {"lamps", "Lamp", "rna_Main_lamp_begin", "Lamps", "Lamp datablocks."},
{NULL, NULL, NULL, NULL, NULL},
{"libraries", "Library", "rna_Main_library_begin", "Libraries", "Library datablocks."},
{"curves", "Curve", "rna_Main_curve_begin", "Curves", "Curve datablocks."},
@@ -218,7 +221,6 @@ void RNA_def_main(BlenderRNA *brna)
{"textures", "Texture", "rna_Main_tex_begin", "Textures", "Texture datablocks."},
{"images", "Image", "rna_Main_image_begin", "Images", "Image datablocks."},
{"lattices", "Lattice", "rna_Main_latt_begin", "Lattices", "Lattice datablocks."},
- {"lamps", "Lamp", "rna_Main_lamp_begin", "Lamps", "Lamp datablocks."},
{"cameras", "Camera", "rna_Main_camera_begin", "Cameras", "Camera datablocks."},
{"ipos", "Ipo", "rna_Main_ipo_begin", "Ipos", "Ipo datablocks."},
{"keys", "Key", "rna_Main_key_begin", "Keys", "Key datablocks."},