Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2015-03-06 15:07:02 +0300
committerJens Verwiebe <info@jensverwiebe.de>2015-03-06 15:07:02 +0300
commite95732bced280562be92aeb4d82d0eefb58cb06c (patch)
treec616105f79d87595796404dcd70ffe202ef7955b /source/blender/windowmanager
parent9794facab393e486cc7bb3ad77b0ee70cd39e890 (diff)
Fix broken "force setting multisamples only once", introduced in b5b359b48f7f
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_window.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index cb2f728101b..e341e4900fa 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;