[Bf-blender-cvs] [d0000ef] HMD_viewport: Several minor corrections

[Julian Eisel]

Commit: d0000ef6fc2cd8a2de2dfb530b2c1f36aa9937e6
Author: Julian Eisel
Date:   Wed Nov 23 01:24:50 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rBd0000ef6fc2cd8a2de2dfb530b2c1f36aa9937e6

Several minor corrections

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

M	release/scripts/startup/bl_ui/space_userpref.py
M	source/blender/windowmanager/intern/wm_operators.c

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

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 8b90660..1940edb 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -442,10 +442,10 @@ class USERPREF_PT_system(Panel):
         col.prop(system, "hmd_device", text="Device")
         col.prop(system, "use_hmd_rotation")
         col.prop(system, "use_hmd_device_ipd")
-        col.prop(system, "hmd_lensdist_type", text="Lens Distortion")
         subcol = col.column()
         subcol.active = not system.use_hmd_device_ipd
         subcol.prop(system, "hmd_custom_ipd")
+        col.prop(system, "hmd_lensdist_type", text="Lens Distortion")
 
         # 2. Column
         column = split.column()
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 2424eac..4633bc6 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -4254,7 +4254,7 @@ static int hmd_session_refresh_invoke(bContext *C, wmOperator *UNUSED(op), const
 	 * get the modelview/projection matrices from HMD device when drawing */
 	ED_area_tag_redraw(sa);
 
-	return (OPERATOR_FINISHED | OPERATOR_PASS_THROUGH);
+	return OPERATOR_FINISHED;
 }
 
 static void WM_OT_hmd_session_refresh(wmOperatorType *ot)
@@ -4268,7 +4268,7 @@ static void WM_OT_hmd_session_refresh(wmOperatorType *ot)
 	ot->invoke = hmd_session_refresh_invoke;
 
 	/* flags */
-	ot->flag = (OPTYPE_INTERNAL | OPTYPE_BLOCKING);
+	ot->flag = OPTYPE_INTERNAL;
 }
 
 #endif /* WITH_INPUT_HMD */