[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17636] branches/blender2.5/blender/source /blender/makesrna: Added Group type to RNA

[Campbell Barton]

Revision: 17636
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17636
Author:   campbellbarton
Date:     2008-11-30 06:07:57 +0100 (Sun, 30 Nov 2008)

Log Message:
-----------
Added Group type to RNA

Modified Paths:
--------------
    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_ID.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h

Added Paths:
-----------
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_group.c

Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h	2008-11-30 03:52:07 UTC (rev 17635)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h	2008-11-30 05:07:57 UTC (rev 17636)
@@ -96,6 +96,7 @@
 extern StructRNA RNA_ActuatorSensor;
 extern StructRNA RNA_DelaySensor;
 extern StructRNA RNA_Camera;
+extern StructRNA RNA_Group;
 /* Pointer
  *
  * These functions will fill in RNA pointers, this can be done in three ways:

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c	2008-11-30 03:52:07 UTC (rev 17635)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c	2008-11-30 05:07:57 UTC (rev 17636)
@@ -889,6 +889,7 @@
 	{"rna_wm.c", RNA_def_wm},
 	{"rna_sensor.c", RNA_def_sensor},
 	{"rna_camera.c", RNA_def_camera},
+	{"rna_group.c", RNA_def_group},
 	{NULL, NULL}};
 
 static int rna_preprocess(char *basedirectory, FILE *f)

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c	2008-11-30 03:52:07 UTC (rev 17635)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c	2008-11-30 05:07:57 UTC (rev 17636)
@@ -59,6 +59,7 @@
 
 	switch(GS(id->name)) {
 		case ID_CA: return &RNA_Camera;
+		case ID_GR: return &RNA_Group;
 		case ID_LA: return &RNA_Lamp;
 		case ID_LI: return &RNA_Library;
 		case ID_MA: return &RNA_Material;

Added: branches/blender2.5/blender/source/blender/makesrna/intern/rna_group.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_group.c	                        (rev 0)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_group.c	2008-11-30 05:07:57 UTC (rev 17636)
@@ -0,0 +1,70 @@
+/**
+ * $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): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+
+#include "RNA_define.h"
+#include "RNA_types.h"
+
+#include "rna_internal.h"
+
+#include "DNA_group_types.h"
+
+#ifdef RNA_RUNTIME
+
+void *rna_Group_objects_get(CollectionPropertyIterator *iter)
+{
+	ListBaseIterator *internal= iter->internal;
+
+	/* we are actually iterating a GroupObject list, so override get */
+	return ((GroupObject *)internal->link)->ob;
+}
+
+#else
+
+void RNA_def_group(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	srna= RNA_def_struct(brna, "Group", "ID", "Group");
+
+	prop= RNA_def_property(srna, "dupli_ofs", PROP_FLOAT, PROP_VECTOR);
+	RNA_def_property_ui_text(prop, "Dupli Offset", "Offset from the center to use when instancing as DupliGroup.");
+	RNA_def_property_ui_range(prop, -10000.0, 10000.0, 10, 4);
+	
+	prop= RNA_def_property(srna, "objects", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_sdna(prop, NULL, "gobject", NULL);
+	RNA_def_property_struct_type(prop, "Object");
+	RNA_def_property_ui_text(prop, "Objects", "A collection of this groups objects");
+	RNA_def_property_collection_funcs(prop, 0, 0, 0, "rna_Group_objects_get", 0, 0, 0, 0);
+	
+	prop= RNA_def_property(srna, "layer", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "layer", 1);
+	RNA_def_property_array(prop, 20);
+	RNA_def_property_ui_text(prop, "Dupli Layers", "Layers visible when this groups is instanced as a dupli.");	
+}
+
+#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-11-30 03:52:07 UTC (rev 17635)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h	2008-11-30 05:07:57 UTC (rev 17636)
@@ -94,6 +94,7 @@
 void RNA_def_wm(struct BlenderRNA *brna);
 void RNA_def_sensor(struct BlenderRNA *brna);
 void RNA_def_camera(struct BlenderRNA *brna);
+void RNA_def_group(struct BlenderRNA *brna);
 
 /* ID Properties */