Revision: 28340
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28340
Author: campbellbarton
Date: 2010-04-22 10:25:05 +0200 (Thu, 22 Apr 2010)
Log Message:
-----------
rna: added lib.parent access and made filename editable.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesrna/intern/rna_ID.c
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2010-04-22
06:59:41 UTC (rev 28339)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2010-04-22
08:25:05 UTC (rev 28340)
@@ -178,13 +178,7 @@
ModifierData *modifiers_findByName(Object *ob, const char *name)
{
- ModifierData *md = ob->modifiers.first;
-
- for (; md; md=md->next)
- if (strcmp(md->name, name)==0)
- break;
-
- return md;
+ return BLI_findstring(&(ob->modifiers), name, offsetof(ModifierData,
name));
}
void modifiers_clearErrors(Object *ob)
Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c 2010-04-22
06:59:41 UTC (rev 28339)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c 2010-04-22
08:25:05 UTC (rev 28340)
@@ -93,7 +93,7 @@
defgroup = MEM_callocN(sizeof(bDeformGroup), "add deformGroup");
- BLI_strncpy(defgroup->name, name, 32);
+ BLI_strncpy(defgroup->name, name, sizeof(defgroup->name));
BLI_addtail(&ob->defbase, defgroup);
defgroup_unique_name(defgroup, ob);
Modified: trunk/blender/source/blender/makesdna/DNA_ID.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_ID.h 2010-04-22 06:59:41 UTC
(rev 28339)
+++ trunk/blender/source/blender/makesdna/DNA_ID.h 2010-04-22 08:25:05 UTC
(rev 28340)
@@ -116,10 +116,10 @@
ID id;
ID *idblock;
struct FileData *filedata;
- char name[240]; /* revealed in the UI, can store
relative path */
- char filename[240]; /* expanded name, not relative, used
while reading */
+ char name[240]; /* path name used for reading, can be
relative and edited in the outliner */
+ char filename[240]; /* temp. absolute filepath, only used
while reading */
int tot, pad; /* tot, idblock and filedata are only
fo read and write */
- struct Library *parent; /* for outliner, showing dependency */
+ struct Library *parent; /* set for indirectly linked libs, used in the
outliner and while reading */
} Library;
#define PREVIEW_MIPMAPS 2
Modified: trunk/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ID.c 2010-04-22
06:59:41 UTC (rev 28339)
+++ trunk/blender/source/blender/makesrna/intern/rna_ID.c 2010-04-22
08:25:05 UTC (rev 28340)
@@ -401,8 +401,12 @@
prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH);
RNA_def_property_string_sdna(prop, NULL, "name");
- RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Filename", "Path to the library .blend
file");
+ /* TODO - lib->filename isnt updated, however the outliner also skips
this, probably only needed on read. */
+
+ prop= RNA_def_property(srna, "parent", PROP_POINTER, PROP_NONE);
+ RNA_def_property_struct_type(prop, "ID");
+ RNA_def_property_ui_text(prop, "Parent", "");
}
void RNA_def_ID(BlenderRNA *brna)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
