diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-30 06:03:40 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-30 06:03:40 +0400 |
commit | 65668dc5eb45ae6e90675aecc9dd6132dc7f0b5e (patch) | |
tree | 355f3b4dd6f28dc0debf249d1c85a6474784dcfe /source/blender/makesrna/intern/rna_ID.c | |
parent | 16702c172939a399ddd0e61fc14a8b0944c4249b (diff) | |
parent | 15bd96efeb77cf33215613a53059f01db7242b31 (diff) |
Merged changes in the trunk up to revision 41368.
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_ID.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 420fe319d08..ea277df2815 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -331,6 +329,12 @@ int rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assig } } +void rna_Library_filepath_set(PointerRNA *ptr, const char *value) +{ + Library *lib= (Library*)ptr->data; + BKE_library_filepath_set(lib, value); +} + #else static void rna_def_ID_properties(BlenderRNA *brna) @@ -526,7 +530,7 @@ static void rna_def_library(BlenderRNA *brna) prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH); RNA_def_property_string_sdna(prop, NULL, "name"); RNA_def_property_ui_text(prop, "File Path", "Path to the library .blend file"); - /* TODO - lib->filename isnt updated, however the outliner also skips this, probably only needed on read. */ + RNA_def_property_string_funcs(prop, NULL, NULL, "rna_Library_filepath_set"); prop= RNA_def_property(srna, "parent", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "Library"); |