diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-10 13:49:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-10 13:49:44 +0400 |
| commit | 076932c7cbb5fdb9942ccb55baf4f813cc70ae08 (patch) | |
| tree | d284974e7f34c43e9d915fc20b1cfb0393a2d8bd /source/blender/windowmanager/intern/wm_operators.c | |
| parent | a963e7ae4245f2ab393bd1f78ec6ea00fd4c7ef2 (diff) | |
alternate solution for r55921 which was calling invoke() from exec(), which shouldnt be done.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_operators.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index f8628578fd8..1fac48259c1 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2376,7 +2376,6 @@ static int wm_save_as_mainfile_invoke(bContext *C, wmOperator *op, const wmEvent } /* function used for WM_OT_save_mainfile too */ -static int wm_save_mainfile_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)); static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op) { char path[FILE_MAX]; @@ -2387,13 +2386,7 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op) if (RNA_struct_property_is_set(op->ptr, "filepath")) RNA_string_get(op->ptr, "filepath", path); else { - /* if file has no name, then treat like startup file */ - if (G.main->name[0] == 0) { - G.save_over = false; - return wm_save_mainfile_invoke(C, op, (wmEvent *)NULL); - } - else - BLI_strncpy(path, G.main->name, FILE_MAX); + BLI_strncpy(path, G.main->name, FILE_MAX); untitled(path); } |