svn merge -r37700:37800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / windowmanager / intern / wm_init_exit.c
index 57c3e2e233c43e67fb2129c17f30e0e4d303390d..aef46f92a3390ac265d0b4bec0e3a604a2b7ec50 100644 (file)
@@ -156,6 +156,7 @@ void WM_init(bContext *C, int argc, const char **argv)
        BPY_python_start(argc, argv);
 
        BPY_driver_reset();
+       BPY_app_handlers_reset();
        BPY_modules_load_user(C);
 #else
        (void)argc; /* unused */
@@ -170,6 +171,7 @@ void WM_init(bContext *C, int argc, const char **argv)
        if (!G.background) {
                GPU_extensions_init();
                GPU_set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
+               GPU_set_anisotropic(U.anisotropic_filter);
        
                UI_init();
        }
@@ -329,7 +331,6 @@ static void free_openrecent(void)
 
 /* bad stuff*/
 
-extern ListBase editelems;
 extern wchar_t *copybuf;
 extern wchar_t *copybufinfo;
 
@@ -381,7 +382,6 @@ void WM_exit(bContext *C)
        
        BKE_freecubetable();
        
-       fastshade_free_render();        /* shaded view */
        ED_preview_free_dbase();        /* frees a Main dbase, before free_blender! */
 
        if(C && CTX_wm_manager(C))
@@ -395,10 +395,6 @@ void WM_exit(bContext *C)
        free_anim_drivers_copybuf();
        free_fmodifiers_copybuf();
        free_posebuf();
-//     free_vertexpaint();
-//     free_imagepaint();
-       
-//     fsmenu_free();
 
        BLF_exit();
        
@@ -421,10 +417,6 @@ void WM_exit(bContext *C)
        BPY_python_end();
 #endif
 
-       if (!G.background) {
-// XXX         UI_filelist_free_icons();
-       }
-       
        GPU_buffer_pool_free(NULL);
        GPU_free_unused_buffers();
        GPU_extensions_exit();