[Bf-blender-cvs] [6e4e5f64845] master: UI: Allow spawning file browser dialog from regular file browser editor
Julian Eisel
noreply at git.blender.org
Tue Jan 24 15:37:50 CET 2023
Commit: 6e4e5f6484534aa38488d4605fd0e9c2432bbf68
Author: Julian Eisel
Date: Tue Jan 24 15:30:10 2023 +0100
Branches: master
https://developer.blender.org/rB6e4e5f6484534aa38488d4605fd0e9c2432bbf68
UI: Allow spawning file browser dialog from regular file browser editor
When some path property was displayed in the File Browser, clicking the
icon to open a file browser dialog to choose a file/directory would
show an error. While this makes sense when you are already in a file
browser dialog (we don't support such nested file browser dialogs),
allow it when the file browser is opened as a normal editor, not as a
dialog.
===================================================================
M source/blender/editors/space_buttons/buttons_ops.c
===================================================================
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index 9c8d46a41f9..b45abcf8068 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -268,8 +268,9 @@ static int file_browse_invoke(bContext *C, wmOperator *op, const wmEvent *event)
FileBrowseOp *fbo;
char *str;
- if (CTX_wm_space_file(C)) {
- BKE_report(op->reports, RPT_ERROR, "Cannot activate a file selector, one already open");
+ const SpaceFile *sfile = CTX_wm_space_file(C);
+ if (sfile && sfile->op) {
+ BKE_report(op->reports, RPT_ERROR, "Cannot activate a file selector dialog, one already open");
return OPERATOR_CANCELLED;
}
More information about the Bf-blender-cvs
mailing list