Commit: f6bd5b34e0a767af4a4da73c7e2bc6384b661e55
Author: Dalai Felinto
Date: Wed Mar 4 18:55:07 2015 -0300
Branches: multiview
https://developer.blender.org/rBf6bd5b34e0a767af4a4da73c7e2bc6384b661e55
Merge remote-tracking branch 'origin/master' into multiview
Conflicts:
source/blender/windowmanager/intern/wm_window.c
===================================================================
===================================================================
diff --cc source/blender/editors/render/render_opengl.c
index 0f63010,d5cf7dd..8d99a60
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@@ -252,9 -136,10 +252,9 @@@ static void screen_opengl_render_doit(O
int sizey = oglrender->sizey;
const short view_context = (v3d != NULL);
bool draw_bgpic = true;
- bool draw_sky = (scene->r.alphamode == R_ADDSKY);
+ bool draw_sky = (scene->r.alphamode == R_ADDSKY) && v3d && (v3d->flag3
& V3D_SHOW_WORLD);
unsigned char *rect = NULL;
-
- rr = RE_AcquireResultRead(oglrender->re);
+ const char *viewname = RE_GetActiveRenderView(oglrender->re);
if (oglrender->is_sequencer) {
SeqRenderData context;
diff --cc source/blender/windowmanager/intern/wm_window.c
index 6cd22ce,cb2f728..59a77fb
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@@ -369,10 -363,10 +369,14 @@@ static void wm_window_add_ghostwindow(w
/* 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)
- multisamples = U.ogl_multisamples;
-
+ glSettings.numOfAASamples = U.ogl_multisamples;
+
+ /* a new window is created when pageflip mode is required for a window
*/
- stereo = win->stereo3d_format->display_mode == S3D_DISPLAY_PAGEFLIP;
++ if (win->stereo3d_format->display_mode == S3D_DISPLAY_PAGEFLIP)
++ glSettings.flags |= GHOST_glStereoVisual;
++
+ if (!(U.uiflag2 & USER_OPENGL_NO_WARN_SUPPORT))
+ glSettings.flags |= GHOST_glWarnSupport;
wm_get_screensize(&scr_w, &scr_h);
posy = (scr_h - win->posy - win->sizey);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
