Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2013-04-13 16:03:20 +0400
committerTon Roosendaal <ton@blender.org>2013-04-13 16:03:20 +0400
commitd867cefa32ca3b26bbfc279e2f04d4f795dc13a4 (patch)
tree6c96c71400ffc5da4a8b48e2ff456e13af4f81ab /source/blender/windowmanager/intern/wm_operators.c
parent9eea6c7057c6e092a5e29e6a595c7dc7d0f14072 (diff)
Bug fix #34896
The feature "Keep Session" was also loading that session when you double-click on a .blend to open it, or when a .blend file was on commandline. Moved this feature to the main() in creator.c, so it can check on it properly, skipping the kept session when a file was loaded.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_operators.c')
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 8f741402154..8b7073c2c65 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2237,7 +2237,7 @@ static void WM_OT_link_append(wmOperatorType *ot)
/* *************** recover last session **************** */
-void wm_recover_last_session(bContext *C, ReportList *reports)
+void WM_recover_last_session(bContext *C, ReportList *reports)
{
char filename[FILE_MAX];
@@ -2268,7 +2268,7 @@ void wm_recover_last_session(bContext *C, ReportList *reports)
static int wm_recover_last_session_exec(bContext *C, wmOperator *op)
{
- wm_recover_last_session(C, op->reports);
+ WM_recover_last_session(C, op->reports);
return OPERATOR_FINISHED;
}