[Bf-blender-cvs] [ab86faf] soc-2014-viewport_fx: removed some accidentally added backup files
Jason Wilkins
noreply at git.blender.org
Thu Jul 10 14:35:48 CEST 2014
Commit: ab86fafed47f584a76321b9b2cad69c1276f1da0
Author: Jason Wilkins
Date: Thu Jul 10 07:17:46 2014 -0500
https://developer.blender.org/rBab86fafed47f584a76321b9b2cad69c1276f1da0
removed some accidentally added backup files
===================================================================
D source/blender/windowmanager/intern/wm_init_exit.c.0
D source/blender/windowmanager/intern/wm_init_exit.c.orig
D source/blender/windowmanager/intern/wm_window.c.0
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c.0 b/source/blender/windowmanager/intern/wm_init_exit.c.0
deleted file mode 100644
index 5dafadc..0000000
--- a/source/blender/windowmanager/intern/wm_init_exit.c.0
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2007 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/windowmanager/intern/wm_init_exit.c
- * \ingroup wm
- *
- * Manage initializing resources and correctly shutting down.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef WIN32
-# include <windows.h>
-#endif
-
-#include "MEM_guardedalloc.h"
-
-#include "IMB_imbuf_types.h"
-#include "IMB_imbuf.h"
-
-#include "DNA_scene_types.h"
-#include "DNA_userdef_types.h"
-#include "DNA_windowmanager_types.h"
-
-#include "BLI_callbacks.h"
-#include "BLI_listbase.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-#include "BLI_threads.h"
-#include "BLI_utildefines.h"
-
-#include "BKE_blender.h"
-#include "BKE_context.h"
-#include "BKE_screen.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_global.h"
-#include "BKE_library.h"
-#include "BKE_main.h"
-#include "BKE_mball.h"
-#include "BKE_node.h"
-#include "BKE_report.h"
-
-#include "BKE_addon.h"
-#include "BKE_sequencer.h" /* free seq clipboard */
-#include "BKE_material.h" /* clear_matcopybuf */
-#include "BKE_tracking.h" /* free tracking clipboard */
-#include "BKE_mask.h" /* free mask clipboard */
-
-#include "RE_engine.h"
-#include "RE_pipeline.h" /* RE_ free stuff */
-
-#ifdef WITH_PYTHON
-#include "BPY_extern.h"
-#endif
-
-#ifdef WITH_GAMEENGINE
-# include "BL_System.h"
-#endif
-#include "GHOST_Path-api.h"
-#include "GHOST_C-api.h"
-
-#include "RNA_define.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "wm_cursors.h"
-#include "wm_event_system.h"
-#include "wm.h"
-#include "wm_files.h"
-#include "wm_window.h"
-
-#include "ED_armature.h"
-#include "ED_keyframing.h"
-#include "ED_node.h"
-#include "ED_render.h"
-#include "ED_space_api.h"
-#include "ED_screen.h"
-#include "ED_util.h"
-
-#include "UI_interface.h"
-#include "BLF_api.h"
-#include "BLF_translation.h"
-
-#include "GPU_buffers.h"
-#include "GPU_extensions.h"
-#include "GPU_draw.h"
-
-#include "BKE_depsgraph.h"
-#include "BKE_sound.h"
-#include "COM_compositor.h"
-
-static void wm_init_reports(bContext *C)
-{
- BKE_reports_init(CTX_wm_reports(C), RPT_STORE);
-}
-static void wm_free_reports(bContext *C)
-{
- BKE_reports_clear(CTX_wm_reports(C));
-}
-
-bool wm_start_with_console = false; /* used in creator.c */
-
-/* only called once, for startup */
-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();
-
- BKE_addon_pref_type_init();
-
- wm_operatortype_init();
- WM_menutype_init();
- WM_uilisttype_init();
-
- set_free_windowmanager_cb(wm_close_and_free); /* library.c */
- set_free_notifier_reference_cb(WM_main_remove_notifier_reference); /* library.c */
- set_blender_test_break_cb(wm_window_testbreak); /* blender.c */
- DAG_editors_update_cb(ED_render_id_flush_update, ED_render_scene_update); /* depsgraph.c */
-
- ED_spacetypes_init(); /* editors/space_api/spacetype.c */
-
- ED_file_init(); /* for fsmenu */
- ED_node_init_butfuncs();
-
- BLF_init(11, U.dpi); /* Please update source/gamengine/GamePlayer/GPG_ghost.cpp if you change this */
- BLF_lang_init();
-
- /* Enforce loading the UI for the initial homefile */
- G.fileflags &= ~G_FILE_NO_UI;
-
- /* get the default database, plus a wm */
- wm_homefile_read(C, NULL, G.factory_startup, NULL);
-
- BLF_lang_set(NULL);
-
- /* 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
- * initializing space types and other internal data.
- *
- * However cant redo this at the moment. Solution is to load python
- * before wm_homefile_read() or make py-drivers check if python is running.
- * Will try fix when the crash can be repeated. - campbell. */
-
-#ifdef WITH_PYTHON
- BPY_context_set(C); /* necessary evil */
- BPY_python_start(argc, argv);
-
- BPY_python_reset(C);
-#else
- (void)argc; /* unused */
- (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) {
- GPU_extensions_init();
- GPU_set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
- GPU_set_anisotropic(U.anisotropic_filter);
- GPU_set_gpu_mipmapping(U.use_gpu_mipmap);
-
- UI_init();
- }
-
- clear_matcopybuf();
- ED_render_clear_mtex_copybuf();
-
- // glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
- ED_preview_init_dbase();
-
- wm_read_history();
-
- /* allow a path of "", this is what happens when making a new file */
-#if 0
- if (G.main->name[0] == 0)
- BLI_make_file_string("/", G.main->name, BLI_getDefaultDocumentFolder(), "untitled.blend");
-#endif
-
- BLI_strncpy(G.lib, G.main->name, FILE_MAX);
-
-#ifdef WITH_COMPOSITOR
- if (1) {
- extern void *COM_linker_hack;
- COM_linker_hack = COM_execute;
- }
-#endif
-
- /* load last session, uses regular file reading so it has to be in end (after init py etc) */
- if (U.uiflag2 & USER_KEEP_SESSION) {
- /* calling WM_recover_last_session(C, NULL) has been moved to creator.c */
- /* that prevents loading both the kept session, and the file on the command line */
- }
- else {
- /* normally 'wm_homefile_read' will do this,
- * however python is not initialized when called from this function.
- *
- * unlikely any handlers are set but its possible,
- * note that recovering the last session does its own callbacks. */
- BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST);
- }
-}
-
-void WM_init_splash(bContext *C)
-{
- if ((U.uiflag & USER_SPLASH_DISABLE) == 0) {
- wmWindowManager *wm = CTX_wm_manager(C);
- wmWindow *prevwin = CTX_wm_window(C);
-
- if (wm->windows.first) {
- CTX_wm_window_set(C, wm->windows.first);
- WM_operator_name_call(C, "WM_OT_splash", WM_OP_INVOKE_DEFAULT, NULL);
- CTX_wm_window_set(C, prevwin);
- }
- }
-}
-
-bool WM_init_game(bContext *C)
-{
- wmWindowManager *wm = CTX_wm_manager(C);
- wmWindow *win;
-
- ScrArea *sa;
- ARegion *ar = NULL;
-
- Scene *scene = CTX_data_scene(C);
-
- if (!scene) {
- /* XXX, this should not be needed. */
- Main *bmain = CTX_data_main(C);
- scene = bmain->scene.first;
- }
-
- win = wm->windows.first;
-
- /* first to get a valid window */
- if (win)
- CTX_wm_window_set(C, win);
-
- sa = BKE_screen_find_big_area(CTX_wm_screen(C), SPACE_VIEW3D, 0);
- ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
-
- /* if we have a valid 3D view */
- if (sa && ar) {
- ARegion *arhide;
-
- CTX_wm_area_set(C, sa);
- CTX_wm_region_set(C, ar);
-
- /* disable quad view */
- if (ar->alignment == RGN_ALIGN_QSPLIT)
- WM_operator_name_call(C, "SCREEN_OT_region_quadview", WM_OP_EXEC_DEFAULT, NULL);
-
- /* toolbox, properties panel and header are hidden */
- for (arhide = sa->regionbase.first; arhide; arhide = arhide->next) {
- if (arhide->regiontype != RGN_TYPE_WINDOW) {
- if (!(arhide->flag & RGN_FLAG_HIDDEN)) {
- ED_region_toggle_hidden(C, arhide);
- }
- }
- }
-
- /* full screen the area */
- if (!sa->full) {
- ED_screen_full_toggle(C, win, sa);
- }
-
- /* Fullscreen */
- if ((scene->gm.playerflag & GAME_PLAYER_FULLSCREEN)) {
- WM_operator_name_call(C, "WM_OT_window_fullscreen_toggle", WM_OP_EXEC_DEFAULT, NULL);
- wm_get_screensize(&ar->winrct.xmax, &ar->winrct.ymax);
- ar->winx = ar->winrct.xmax + 1;
- ar->winy = ar->winrct.ymax + 1;
- }
- else {
- GHOST_RectangleHandle rect = GHOST_GetClientBounds(win->ghostwin);
- ar->winrct.ymax = GHOST_GetHeightRectangle(rect);
- ar->winrct.xmax = GHOST_GetWidthRectangle(rect);
- ar->winx = ar->winrct.xmax + 1;
- ar->winy = ar->winrct.ymax + 1;
- GHOST_DisposeRectangle(rect);
- }
-
- WM_operator_name_call(C, "VIEW3D_OT_game_start", WM_OP_EXEC_DEFAULT, NULL);
-
- sound_exit();
-
- return true;
- }
- else {
- ReportTimerInfo *rti;
-
- BKE_report(&wm->reports, RPT_ERROR, "No valid 3D View found, game auto start is not possible");
-
- /* After adding the report to the global list, reset the report timer. */
- WM_event_remove_timer(wm, NULL, wm->reports.reporttimer);
-
- /* Records time since last report was added */
- wm->reports.reporttimer = WM_event_add_timer(wm, CTX_wm_window(C), TIMER, 0.02);
-
- rti = MEM_callocN(sizeof(ReportTimerInfo), "ReportTimerInfo");
- wm->reports.reporttimer->customdata = rti;
-
- return false;
- }
-}
-
-/* free strings of open recent files */
-static void free_openrecent(void)
-{
- struct RecentFile *recent;
-
- for (recent = G.recent_files.first; recent; recent = recent->next)
- MEM_freeN(recent->filepath);
-
- BLI_freelistN(&(G.recent_files));
-}
-
-
-/* bad stuff*/
-
-// XXX copy/paste buffer stuff...
-extern void free_anim_copybuf(void);
-extern void free_anim_drivers_copybuf(void);
-extern void free_fmodifiers_copybuf(void);
-
-#ifdef WIN32
-/* Read console events until there is a key event. Also returns on any error. */
-static void wait_for_console_key(void)
-{
- HANDLE hConsoleInput = GetStdHandle(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list