Commit: d1794b897c9540ce29539edb8211109566566fa9
Author: Jens Verwiebe
Date: Fri Mar 6 13:07:02 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBd1794b897c9540ce29539edb8211109566566fa9
Fix broken "force setting multisamples only once", introduced in b5b359b48f7f
===================================================================
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_window.c
b/source/blender/windowmanager/intern/wm_window.c
index cb2f728..e341e49 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -363,7 +363,8 @@ static void wm_window_add_ghostwindow(wmWindowManager *wm,
const char *title, wm
/* 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)
- glSettings.numOfAASamples = U.ogl_multisamples;
+ multisamples = U.ogl_multisamples;
+ glSettings.numOfAASamples = multisamples;
if (!(U.uiflag2 & USER_OPENGL_NO_WARN_SUPPORT))
glSettings.flags |= GHOST_glWarnSupport;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
