Commit: e9b092ce1ee29849ad3464251313607e479bdb8e
Author: Campbell Barton
Date: Thu Jul 24 19:03:08 2014 +1000
Branches: soc-2014-viewport_context
https://developer.blender.org/rBe9b092ce1ee29849ad3464251313607e479bdb8e
Cleanup: sync with master
===================================================================
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_window.c
M source/blender/windowmanager/wm_window.h
M source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
M source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c
b/source/blender/windowmanager/intern/wm_init_exit.c
index 73a9c82..02a0667 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -195,7 +195,7 @@ void WM_init(bContext *C, int argc, const char **argv)
if (!G.background) {
GPU_init();
-
+
GPU_set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
GPU_set_anisotropic(U.anisotropic_filter);
GPU_set_gpu_mipmapping(U.use_gpu_mipmap);
@@ -501,8 +501,10 @@ void WM_exit_ext(bContext *C, const bool do_python)
if (!G.background) {
GPU_global_buffer_pool_free();
GPU_free_unused_buffers();
+
GPU_exit();
}
+
BKE_reset_undo();
ED_file_exit(); /* for fsmenu */
diff --git a/source/blender/windowmanager/intern/wm_window.c
b/source/blender/windowmanager/intern/wm_window.c
index 7e650bf..20e5b1d 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -345,7 +345,7 @@ static void wm_window_add_ghostwindow(wmWindowManager *wm,
const char *title, wm
GHOST_WindowHandle ghostwin;
static int multisamples = -1;
int scr_w, scr_h, posy;
-
+
/* force setting multisamples only once, it requires restart - and you
cannot
* mix it, either all windows have it, or none (tested in OSX opengl) */
if (multisamples == -1)
@@ -363,7 +363,7 @@ static void wm_window_add_ghostwindow(wmWindowManager *wm,
const char *title, wm
if (ghostwin) {
GHOST_RectangleHandle bounds;
-
+
/* the new window has already been made drawable upon creation
*/
wm->windrawable = win;
@@ -428,11 +428,11 @@ void wm_window_add_ghostwindows(wmWindowManager *wm)
if (wm_init_state.size_x == 0) {
wm_get_screensize(&wm_init_state.size_x, &wm_init_state.size_y);
- /* note!, this isnt quite correct, active screen maybe offset
1000s if PX,
- * we'd need a wm_get_screensize like function that gives
offset,
- * in practice the window manager will likely move to the
correct monitor */
- wm_init_state.start_x = 0;
- wm_init_state.start_y = 0;
+ /* note!, this isnt quite correct, active screen maybe offset 1000s if
PX,
+ * we'd need a wm_get_screensize like function that gives offset,
+ * in practice the window manager will likely move to the correct
monitor */
+ wm_init_state.start_x = 0;
+ wm_init_state.start_y = 0;
#ifdef WITH_X11 /* X11 */
/* X11, start maximized but use default sane size */
@@ -1400,6 +1400,7 @@ void wm_window_raise(wmWindow *win)
void wm_window_swap_buffers(wmWindow *win)
{
+
#ifdef WIN32
glDisable(GL_SCISSOR_TEST);
GHOST_SwapWindowBuffers(win->ghostwin);
@@ -1414,7 +1415,7 @@ void wm_window_set_swap_interval (wmWindow *win, int
interval)
GHOST_SetSwapInterval(win->ghostwin, interval);
}
-bool wm_window_get_swap_interval (wmWindow *win, int* intervalOut)
+bool wm_window_get_swap_interval(wmWindow *win, int *intervalOut)
{
return GHOST_GetSwapInterval(win->ghostwin, intervalOut);
}
diff --git a/source/blender/windowmanager/wm_window.h
b/source/blender/windowmanager/wm_window.h
index 02852a8..a71e0fd 100644
--- a/source/blender/windowmanager/wm_window.h
+++ b/source/blender/windowmanager/wm_window.h
@@ -58,8 +58,8 @@ void wm_window_lower (wmWindow *win);
void wm_window_set_size (wmWindow *win, int width, int
height);
void wm_window_get_position (wmWindow *win, int *posx_r, int
*posy_r);
void wm_window_swap_buffers (wmWindow *win);
-void wm_window_set_swap_interval (wmWindow *win, int interval);
-bool wm_window_get_swap_interval (wmWindow *win, int*
intervalOut);
+void wm_window_set_swap_interval(wmWindow *win, int interval);
+bool wm_window_get_swap_interval(wmWindow *win, int *intervalOut);
void wm_get_cursor_position (wmWindow *win, int *x, int *y);
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
index a3f528d..31f3b1b 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
@@ -91,7 +91,7 @@ void KX_BlenderCanvas::SetSwapInterval(int interval)
wm_window_set_swap_interval(m_win, interval);
}
-bool KX_BlenderCanvas::GetSwapInterval(int& intervalOut)
+bool KX_BlenderCanvas::GetSwapInterval(int &intervalOut)
{
return wm_window_get_swap_interval(m_win, &intervalOut);
}
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
index 237be1c..917e013 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
@@ -84,7 +84,7 @@ public:
bool
GetSwapInterval(
- int& intervalOut
+ int &intervalOut
);
void
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
