diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-25 02:51:44 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-25 02:51:44 +0400 |
| commit | 47463742e264d5bfbf81215ea7d907c4e9a3a1e1 (patch) | |
| tree | bab7eea6ec1903c5922d3d9dcea9c99a4b1cc42e /source/blender/makesrna | |
| parent | 4cd1e6337e516015383f3c47886b180ee16d2e3a (diff) | |
| parent | 5b6224c84719213883334bcd9d2c46216053fe35 (diff) | |
Cycles: svn merge -r41232:41266 ^/trunk/blender
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 8 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_fcurve.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 71b34d31e96..ba7d2881ad8 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -326,6 +326,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) @@ -531,7 +537,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"); diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 08a71e0cd4f..c651dca4b31 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -621,7 +621,7 @@ static void rna_FKeyframe_points_remove(FCurve *fcu, ReportList *reports, BezTri static void rna_fcurve_range(FCurve *fcu, float range[2]) { - calc_fcurve_range(fcu, range, range+1, FALSE); + calc_fcurve_range(fcu, range, range+1, FALSE, FALSE); } #else |