[Bf-blender-cvs] [a3d4644] HMD_viewport: UI: Minor adjustments

[Julian Eisel]

Commit: a3d4644996f2cd34ca0ad505be9fe465d1ae68e0
Author: Julian Eisel
Date:   Fri Mar 11 14:54:37 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rBa3d4644996f2cd34ca0ad505be9fe465d1ae68e0

UI: Minor adjustments

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

M	release/scripts/startup/bl_ui/properties_render_layer.py
M	source/blender/editors/space_view3d/view3d_edit.c
M	source/blender/windowmanager/intern/wm_operators.c

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

diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py
index d7a7bbe..d51a5d7 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -225,13 +225,17 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel):
             row.label(text="Camera Suffix:")
             row.prop(rv, "camera_suffix", text="")
         else:
-            icon = 'PAUSE' if scene.hmd_running else 'PLAY'
+            running = scene.hmd_running
+            text_run = "Stop Session" if running else "Start Session"
+            icon = 'PAUSE' if running else 'PLAY'
+
             col = layout.column()
-            col.prop(rd, "hmd_camlock")
+
             row = col.row(align=True)
+            row.operator("wm.hmd_view_open", text="Open HMD Window")
+            row.operator("view3d.hmd_session_run", text=text_run, icon=icon)
 
-            row.operator("wm.hmd_view_open")
-            row.operator("view3d.hmd_session_run", text="", icon=icon)
+            col.prop(rd, "hmd_camlock")
 
 
 if __name__ == "__main__":  # only for live edit.
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 5723c73..a4a5135 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -4826,7 +4826,7 @@ static void hmd_session_refresh(bContext *C, wmWindow *hmd_win, Scene *scene, HM
 	ED_region_tag_redraw(ar);
 }
 
-static wmWindow *hmd_window_find(bContext *C)
+static wmWindow *hmd_window_find(const bContext *C)
 {
 	wmWindowManager *wm = CTX_wm_manager(C);
 	wmWindow *hmd_win = CTX_wm_window(C);
@@ -4849,6 +4849,11 @@ static void hmd_run_exit(wmWindow *hmd_win, Scene *scene)
 	WM_window_fullscreen_toggle(hmd_win, false, true);
 }
 
+static int hmd_session_run_poll(bContext *C)
+{
+	return (hmd_window_find(C) != NULL);
+}
+
 static int hmd_session_run_modal(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	wmWindow *hmd_win = op->customdata;
@@ -4930,6 +4935,7 @@ void VIEW3D_OT_hmd_session_run(wmOperatorType *ot)
 	/* api callbacks */
 	ot->invoke = hmd_session_run_invoke;
 	ot->modal = hmd_session_run_modal;
+	ot->poll = hmd_session_run_poll;
 }
 
 static int hmd_session_refresh_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 45d51e3..9768673 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -5152,7 +5152,7 @@ static void WM_OT_hmd_view_open(wmOperatorType *ot)
 {
 	ot->name = "Open HMD View Window";
 	ot->idname = "WM_OT_hmd_view_open";
-	ot->description = "Open a separate window for display on a head mounted display";
+	ot->description = "Open a separate window for a head mounted display";
 
 	ot->invoke = wm_hmd_view_open_invoke;
 	ot->poll = wm_hmd_view_open_poll;