diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-03 05:30:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-03 05:30:21 +0400 |
| commit | 075fee4d58a65b4313bb7e984ae195690f4c7bfd (patch) | |
| tree | e801da2591eda34a4c4c7fd5436ff476353b1c55 /source/blender/editors/space_buttons | |
| parent | 68cc7e168207c4c519f54f7e0f7f638768386cd0 (diff) | |
| parent | 050963b6a9529e0abdd597d163ddc4343c0b15c2 (diff) | |
svn merge ^/trunk/blender -r43830:43864
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_ops.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index b1a25d093d2..26516bcda99 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -43,6 +43,7 @@ #include "BKE_context.h" #include "BKE_global.h" #include "BKE_main.h" +#include "BKE_report.h" #include "WM_api.h" #include "WM_types.h" @@ -160,6 +161,11 @@ static int file_browse_invoke(bContext *C, wmOperator *op, wmEvent *event) FileBrowseOp *fbo; char *str; + if (CTX_wm_space_file(C)) { + BKE_report(op->reports, RPT_ERROR, "Can't activate a file selector, one already open"); + return OPERATOR_CANCELLED; + } + uiFileBrowseContextProperty(C, &ptr, &prop); if(!prop) |