diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-10-14 01:43:02 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-10-14 01:43:02 +0400 |
| commit | 8be3249537e7930e0fa5adb59bc343455da309e9 (patch) | |
| tree | 0f4f14b046742f4380540e06c529cd417ddbc541 /source/blender/editors/space_buttons | |
| parent | 8bf78d7f5676520bf6f4241afb88fba506e342f4 (diff) | |
| parent | 818c098004ff64adcc0ff24fe29d40850f5591ce (diff) | |
Merge with trunk r40991
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_ops.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index 99e5c6d693e..75b3eb950a5 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -201,6 +201,8 @@ static int file_browse_invoke(bContext *C, wmOperator *op, wmEvent *event) RNA_string_set(op->ptr, path_prop, str); MEM_freeN(str); + /* normally ED_fileselect_get_params would handle this but we need to because of stupid + * user-prefs exception - campbell */ if(RNA_struct_find_property(op->ptr, "relative_path")) { if(!RNA_property_is_set(op->ptr, "relative_path")) { /* annoying exception!, if were dealign with the user prefs, default relative to be off */ |