griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for crash in file selector using the 'Open' button - button was using old UI

Browse Source 
code, changed it to operators
This commit is contained in:
Matt Ebb
2010-01-20 12:28:33 +00:00
parent 1e7858f5a0
commit 973128dc66
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/space_file/file_draw.c
View File

@@ -99,12 +99,6 @@ enum {
static void do_file_buttons(bContext *C, void *arg, int event)
{
switch(event) {
case B_FS_EXEC:
file_exec(C, NULL); /* file_ops.c */
break;
case B_FS_CANCEL:
file_cancel_exec(C, NULL); /* file_ops.c */
break;
case B_FS_PARENT:
file_parent_exec(C, NULL); /* file_ops.c */
break;
@@ -226,12 +220,13 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
/* Execute / cancel buttons. */
if(loadbutton) {
uiDefBut(block, BUT, B_FS_EXEC, params->title,
max_x - loadbutton, line1_y, loadbutton, btn_h,
params->dir, 0.0, (float)FILE_MAXFILE-1, 0, 0, params->title);
uiDefBut(block, BUT, B_FS_CANCEL, "Cancel",
max_x - loadbutton, line2_y, loadbutton, btn_h,
params->file, 0.0, (float)FILE_MAXFILE-1, 0, 0, "Cancel.");
uiDefButO(block, BUT, "FILE_OT_execute", WM_OP_EXEC_REGION_WIN, params->title,
max_x - loadbutton, line1_y, loadbutton, btn_h,
params->title);
uiDefButO(block, BUT, "FILE_OT_cancel", WM_OP_EXEC_REGION_WIN, "Cancel",
max_x - loadbutton, line2_y, loadbutton, btn_h,
"Cancel");
}
uiEndBlock(C, block);

2
source/blender/editors/space_file/file_intern.h
View File

@@ -72,7 +72,7 @@ void FILE_OT_filenum(struct wmOperatorType *ot);
void FILE_OT_delete(struct wmOperatorType *ot);
void FILE_OT_rename(struct wmOperatorType *ot);
int file_exec(bContext *C, struct wmOperator *unused);
int file_exec(bContext *C, struct wmOperator *exec_op);
int file_cancel_exec(bContext *C, struct wmOperator *unused);
int file_parent_exec(bContext *C, struct wmOperator *unused);
int file_previous_exec(bContext *C, struct wmOperator *unused);