[Bf-blender-cvs] [e2dd63e] HMD_viewport: Allow zooming/panning while HMD view is in camera perspective

Julian Eisel noreply at git.blender.org
Tue Nov 22 17:04:48 CET 2016


Commit: e2dd63eb554d4f61e6e0653ee86b3d0c945c6121
Author: Julian Eisel
Date:   Tue Nov 22 17:03:43 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rBe2dd63eb554d4f61e6e0653ee86b3d0c945c6121

Allow zooming/panning while HMD view is in camera perspective

===================================================================

M	source/blender/editors/space_view3d/view3d_draw.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index aa0a797..bee4b6f 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3650,7 +3650,11 @@ static void view3d_hmd_view_setup(Scene *scene, View3D *v3d, ARegion *ar)
 	/* apply 3d view matrices on hmd device ones */
 	mul_m4_m4m4(modelviewmat, modelviewmat, rv3d->viewmat);
 
-	if (rv3d->persp != RV3D_CAMOB) {
+	if (rv3d->persp == RV3D_CAMOB) {
+		/* projection matrix contains camera zoom and camera view offset, needs to be applied */
+		add_m4_m4m4(projmat, projmat, rv3d->winmat);
+	}
+	else {
 		/* apply modelview zoom */
 		modelviewmat[3][2] -= rv3d->dist;
 	}




More information about the Bf-blender-cvs mailing list