[Bf-blender-cvs] [72e5ee8] HMD_viewport: Cleanup: Tweak operator names

[Julian Eisel]

Commit: 72e5ee8471303a00c29898e04327be3b8c182219
Author: Julian Eisel
Date:   Mon Mar 28 19:01:16 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rB72e5ee8471303a00c29898e04327be3b8c182219

Cleanup: Tweak operator names

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

M	release/scripts/startup/bl_ui/properties_render_layer.py
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 8fbf6d7..62e6280 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -235,7 +235,7 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel):
             col = layout.column()
 
             row = col.row(align=True)
-            row.operator("wm.hmd_view_open", text=text_win)
+            row.operator("wm.hmd_view_toggle", text=text_win)
             row.operator("wm.hmd_session_run", text=text_run, icon=icon)
 
             col.prop(rd, "hmd_camlock")
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 8a0e1fa..7d8167a 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -5148,7 +5148,7 @@ static void hmd_view_exit(const bContext *C, Scene *scene)
 	DAG_id_tag_update(&ob->id, OB_RECALC_OB);  /* sets recalc flags */
 }
 
-static int wm_hmd_view_open_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
+static int wm_hmd_view_toggle_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
 {
 	wmWindow *prevwin = CTX_wm_window(C);
 	wmWindowManager *wm = CTX_wm_manager(C);
@@ -5178,21 +5178,21 @@ static int wm_hmd_view_open_invoke(bContext *C, wmOperator *UNUSED(op), const wm
 	return OPERATOR_FINISHED;
 }
 
-static void WM_OT_hmd_view_open(wmOperatorType *ot)
+static void WM_OT_hmd_view_toggle(wmOperatorType *ot)
 {
-	ot->name = "Open HMD View Window";
-	ot->idname = "WM_OT_hmd_view_open";
-	ot->description = "Open a separate window for a head mounted display";
+	ot->name = "Open/Close HMD View Window";
+	ot->idname = "WM_OT_hmd_view_toggle";
+	ot->description = "Open/Close a separate window for a head mounted display";
 
-	ot->invoke = wm_hmd_view_open_invoke;
+	ot->invoke = wm_hmd_view_toggle_invoke;
 }
 
-static int hmd_session_run_poll(bContext *C)
+static int hmd_session_toggle_poll(bContext *C)
 {
 	return (CTX_wm_manager(C)->win_hmd != NULL);
 }
 
-static int hmd_session_run_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
+static int hmd_session_toggle_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
 {
 	Scene *scene = CTX_data_scene(C);
 	wmWindowManager *wm = CTX_wm_manager(C);
@@ -5251,16 +5251,16 @@ static int hmd_session_run_invoke(bContext *C, wmOperator *UNUSED(op), const wmE
 	}
 }
 
-static void WM_OT_hmd_session_run(wmOperatorType *ot)
+static void WM_OT_hmd_session_toggle(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Run HMD Session";
-	ot->description = "Start/Stop a head mounted display (virtual reality) session";
+	ot->description = "Start/Stop a head mounted display session";
 	ot->idname = "WM_OT_hmd_session_run";
 
 	/* api callbacks */
-	ot->invoke = hmd_session_run_invoke;
-	ot->poll = hmd_session_run_poll;
+	ot->invoke = hmd_session_toggle_invoke;
+	ot->poll = hmd_session_toggle_poll;
 }
 
 static void hmd_session_refresh(bContext *C, wmWindow *hmd_win, Scene *scene, HMDData *data)
@@ -5356,8 +5356,8 @@ void wm_operatortype_init(void)
 	WM_operatortype_append(WM_OT_call_menu_pie);
 	WM_operatortype_append(WM_OT_radial_control);
 	WM_operatortype_append(WM_OT_stereo3d_set);
-	WM_operatortype_append(WM_OT_hmd_view_open);
-	WM_operatortype_append(WM_OT_hmd_session_run);
+	WM_operatortype_append(WM_OT_hmd_view_toggle);
+	WM_operatortype_append(WM_OT_hmd_session_toggle);
 	WM_operatortype_append(WM_OT_hmd_session_refresh);
 #if defined(WIN32)
 	WM_operatortype_append(WM_OT_console_toggle);