svn merge -r36564:36583 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / windowmanager / intern / wm_init_exit.c
index 89a7598038ac11eb889988e6bc97a43664d8d64e..2a37654a23bc0a21d0491bdd9c7d692daa445f19 100644 (file)
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file blender/windowmanager/intern/wm_init_exit.c
+ *  \ingroup wm
+ */
+
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include "BKE_main.h"
 #include "BKE_mball.h"
 #include "BKE_report.h"
-#include "BKE_utildefines.h"
+
 #include "BKE_packedFile.h"
 #include "BKE_sequencer.h" /* free seq clipboard */
 #include "BKE_material.h" /* clear_matcopybuf */
 
 #include "BLI_blenlib.h"
+#include "BLI_cellalloc.h"
+#include "BLI_winstuff.h"
 
 #include "RE_pipeline.h"               /* RE_ free stuff */
 
 #endif
 
 #ifdef WITH_GAMEENGINE
-#include "SYS_System.h"
+#include "BL_System.h"
 #endif
 #include "GHOST_Path-api.h"
+#include "GHOST_C-api.h"
 
 #include "RNA_define.h"
 
 
 #include "BKE_depsgraph.h"
 #include "BKE_sound.h"
-#include "GHOST_C-api.h"
 
 static void wm_init_reports(bContext *C)
 {
@@ -109,18 +116,16 @@ static void wm_free_reports(bContext *C)
        BKE_reports_clear(CTX_wm_reports(C));
 }
 
-
+int wm_start_with_console = 0;
 
 /* only called once, for startup */
-void WM_init(bContext *C, int argc, char **argv)
+void WM_init(bContext *C, int argc, const char **argv)
 {
-
        if (!G.background) {
                wm_ghost_init(C);       /* note: it assigns C to ghost! */
                wm_init_cursor_data();
        }
        GHOST_CreateSystemPaths();
-
        wm_operatortype_init();
        
        set_free_windowmanager_cb(wm_close_and_free);   /* library.c */
@@ -134,9 +139,8 @@ void WM_init(bContext *C, int argc, char **argv)
        
        BLF_init(11, U.dpi); /* Please update source/gamengine/GamePlayer/GPG_ghost.cpp if you change this */
        BLF_lang_init();
-       
        /* get the default database, plus a wm */
-       WM_read_homefile(C, NULL);
+       WM_read_homefile(C, NULL, G.factory_startup);
 
        /* note: there is a bug where python needs initializing before loading the
         * startup.blend because it may contain PyDrivers. It also needs to be after
@@ -157,6 +161,9 @@ void WM_init(bContext *C, int argc, char **argv)
        (void)argv; /* unused */
 #endif
 
+       if (!G.background && !wm_start_with_console)
+               GHOST_toggleConsole(3);
+
        wm_init_reports(C); /* reports cant be initialized before the wm */
 
        if (!G.background) {
@@ -175,13 +182,15 @@ void WM_init(bContext *C, int argc, char **argv)
        
        G.ndofdevice = -1;      /* XXX bad initializer, needs set otherwise buttons show! */
        
-       read_history();
+       WM_read_history();
 
+       /* allow a path of "", this is what happens when making a new file */
+       /*
        if(G.main->name[0] == 0)
                BLI_make_file_string("/", G.main->name, BLI_getDefaultDocumentFolder(), "untitled.blend");
+       */
 
        BLI_strncpy(G.lib, G.main->name, FILE_MAX);
-
 }
 
 void WM_init_splash(bContext *C)
@@ -271,7 +280,7 @@ int WM_init_game(bContext *C)
 
                /* full screen the area */
                if(!sa->full) {
-                       ED_screen_full_toggle(C, wm->windows.first, sa);
+                       ED_screen_full_toggle(C, win, sa);
                }
 
                /* Fullscreen */
@@ -344,6 +353,7 @@ void WM_exit(bContext *C)
 
        sound_exit();
 
+
        /* first wrap up running stuff, we assume only the active WM is running */
        /* modal handlers are on window level freed, others too? */
        /* note; same code copied in wm_files.c */
@@ -422,7 +432,7 @@ void WM_exit(bContext *C)
 // XXX         UI_filelist_free_icons();
        }
        
-       GPU_buffer_pool_free(0);
+       GPU_buffer_pool_free(NULL);
        GPU_free_unused_buffers();
        GPU_extensions_exit();
        
@@ -450,8 +460,10 @@ void WM_exit(bContext *C)
        GHOST_DisposeSystemPaths();
 
        if(MEM_get_memory_blocks_in_use()!=0) {
-               printf("Error Totblock: %d\n", MEM_get_memory_blocks_in_use());
+               printf("Error: Not freed memory blocks: %d\n", MEM_get_memory_blocks_in_use()+BLI_cellalloc_get_totblock());
                MEM_printmemlist();
+               BLI_cellalloc_printleaks();
+               BLI_cellalloc_destroy();
        }
        wm_autosave_delete();
        
@@ -464,7 +476,6 @@ void WM_exit(bContext *C)
                getchar();
        }
 #endif 
-       
        exit(G.afbreek==1);
 }