Commit: b95a7c0af3591bef1cb494d7111a1249b6a41769 Author: Julian Eisel Date: Wed Oct 12 01:05:25 2016 +0200 Branches: HMD_viewport https://developer.blender.org/rBb95a7c0af3591bef1cb494d7111a1249b6a41769
Fix disabling lens distortion shader causing OpenGL shader error Also cleanup. =================================================================== M source/blender/gpu/intern/gpu_compositing.c M source/blender/windowmanager/intern/wm_operators.c M source/blender/windowmanager/intern/wm_stereo.c =================================================================== diff --git a/source/blender/gpu/intern/gpu_compositing.c b/source/blender/gpu/intern/gpu_compositing.c index dd3c974..f69f1b1 100644 --- a/source/blender/gpu/intern/gpu_compositing.c +++ b/source/blender/gpu/intern/gpu_compositing.c @@ -1291,7 +1291,7 @@ bool GPU_fx_do_composite_pass( } /* third pass, Lens Distortion */ - if(fx->effects & GPU_FX_FLAG_LensDist) { + if (fx->effects & GPU_FX_FLAG_LensDist) { GPUShader *lensdist_shader = GPU_shader_get_builtin_fx_shader(GPU_SHADER_FX_LENS_DISTORTION, is_persp); if (lensdist_shader) { diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index f2dbcca..183ccbc 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -4159,7 +4159,9 @@ static void hmd_view_prepare_screen(bContext *C, Scene *scene, wmWindow *win) /* sync view options */ v3d->drawtype = scene->hmd_settings.view_shade; - v3d->fx_settings.fx_flag = scene->hmd_settings.flag; + if (scene->hmd_settings.flag & HMDVIEW_USE_LENSDIST_FX) { + v3d->fx_settings.fx_flag |= GPU_FX_FLAG_LensDist; + } rv3d->persp = RV3D_CAMOB; rv3d->camzoom = BKE_screen_view3d_zoom_from_fac(1.0f); diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c index 4b4336b..6fa9a69 100644 --- a/source/blender/windowmanager/intern/wm_stereo.c +++ b/source/blender/windowmanager/intern/wm_stereo.c @@ -291,7 +291,7 @@ static void wm_method_draw_stereo3d_hmd(wmWindow *win) wmDrawData *drawdata; int view; - for (view = 0; view < 2; view ++) { + for (view = 0; view < 2; view++) { const int win_x_h = WM_window_pixels_x(win) / 2; const int win_y = WM_window_pixels_y(win); @@ -311,7 +311,7 @@ void wm_method_draw_stereo3d(const bContext *C, wmWindow *win) Scene *scene = CTX_data_scene(C); wmWindowManager *wm = CTX_wm_manager(C); - if (wm->win_hmd == win && scene->hmd_settings.flag & HMDVIEW_SESSION_RUNNING) { + if (wm->win_hmd == win && (scene->hmd_settings.flag & HMDVIEW_SESSION_RUNNING)) { wm_method_draw_stereo3d_hmd(win); return; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs