[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32971] trunk/blender/source/blender: string lookup for scene.object_bases, also removed some unused DNA vars.
Campbell Barton
ideasman42 at gmail.com
Wed Nov 10 01:51:34 CET 2010
Revision: 32971
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32971
Author: campbellbarton
Date: 2010-11-10 01:51:34 +0100 (Wed, 10 Nov 2010)
Log Message:
-----------
string lookup for scene.object_bases, also removed some unused DNA vars.
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_action_types.h
trunk/blender/source/blender/makesdna/DNA_image_types.h
trunk/blender/source/blender/makesdna/DNA_lattice_types.h
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/source/blender/makesdna/DNA_action_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_action_types.h 2010-11-09 17:27:24 UTC (rev 32970)
+++ trunk/blender/source/blender/makesdna/DNA_action_types.h 2010-11-10 00:51:34 UTC (rev 32971)
@@ -193,9 +193,9 @@
short agrp_index; /* index of action-group this bone belongs to (0 = default/no group) */
// XXX depreceated.... old animation system (armature only viz) ----
- int pathlen; /* for drawing paths, the amount of frames */
- int pathsf; /* for drawing paths, the start frame number */
- int pathef; /* for drawing paths, the end frame number */
+// int pathlen; /* for drawing paths, the amount of frames */
+// int pathsf; /* for drawing paths, the start frame number */
+// int pathef; /* for drawing paths, the end frame number */
// XXX end of depreceated code -------------------------------------
struct Bone *bone; /* set on read file or rebuild pose */
Modified: trunk/blender/source/blender/makesdna/DNA_image_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_image_types.h 2010-11-09 17:27:24 UTC (rev 32970)
+++ trunk/blender/source/blender/makesdna/DNA_image_types.h 2010-11-10 00:51:34 UTC (rev 32971)
@@ -51,8 +51,9 @@
short flag, ok;
short multi_index, layer, pass; /* listbase indices, for menu browsing or retrieve buffer */
- short menunr; /* localized menu entry, for handling browse event */
-
+ /* short menunr; */ /* localized menu entry, for handling browse event */
+ short pad;
+
struct Scene *scene; /* to retrieve render result */
} ImageUser;
Modified: trunk/blender/source/blender/makesdna/DNA_lattice_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_lattice_types.h 2010-11-09 17:27:24 UTC (rev 32970)
+++ trunk/blender/source/blender/makesdna/DNA_lattice_types.h 2010-11-10 00:51:34 UTC (rev 32971)
@@ -49,7 +49,7 @@
short pntsu, pntsv, pntsw, flag;
short opntsu, opntsv, opntsw, pad2;
- char typeu, typev, typew, type;
+ char typeu, typev, typew, pad3;
int pad;
float fu, fv, fw, du, dv, dw;
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2010-11-09 17:27:24 UTC (rev 32970)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2010-11-10 00:51:34 UTC (rev 32971)
@@ -150,6 +150,8 @@
#include "DNA_object_types.h"
#include "DNA_mesh_types.h"
+#include "RNA_access.h"
+
#include "MEM_guardedalloc.h"
#include "BKE_context.h"
@@ -180,6 +182,20 @@
#include "RE_pipeline.h"
+static PointerRNA rna_Scene_object_bases_lookup_string(PointerRNA *ptr, const char *key)
+{
+ Scene *scene= (Scene*)ptr->data;
+ Base *base;
+
+ for(base= scene->base.first; base; base= base->next) {
+ if(strncmp(base->object->id.name+2, key, sizeof(base->object->id.name)-2)==0) {
+ return rna_pointer_inherit_refine(ptr, &RNA_ObjectBase, base);
+ }
+ }
+
+ return PointerRNA_NULL;
+}
+
static PointerRNA rna_Scene_objects_get(CollectionPropertyIterator *iter)
{
ListBaseIterator *internal= iter->internal;
@@ -3107,6 +3123,7 @@
RNA_def_property_collection_sdna(prop, NULL, "base", NULL);
RNA_def_property_struct_type(prop, "ObjectBase");
RNA_def_property_ui_text(prop, "Bases", "");
+ RNA_def_property_collection_funcs(prop, 0, 0, 0, 0, 0, 0, "rna_Scene_object_bases_lookup_string");
rna_def_scene_bases(brna, prop);
prop= RNA_def_property(srna, "objects", PROP_COLLECTION, PROP_NONE);
More information about the Bf-blender-cvs
mailing list