[Bf-blender-cvs] [994e0b0] HMD_viewport: Fix missing play button

Julian Eisel noreply at git.blender.org
Wed Mar 16 16:11:00 CET 2016


Commit: 994e0b04d92a3ec132e4bea6b811d66d86243e18
Author: Julian Eisel
Date:   Fri Mar 11 03:17:52 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rB994e0b04d92a3ec132e4bea6b811d66d86243e18

Fix missing play button

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py
index 2b91855..d7a7bbe 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -231,7 +231,7 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel):
             row = col.row(align=True)
 
             row.operator("wm.hmd_view_open")
-            row.operator("view3d.hmd_run", text="", icon=icon)
+            row.operator("view3d.hmd_session_run", text="", icon=icon)
 
 
 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 b882ffa..a7cd860 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -4896,7 +4896,6 @@ static int hmd_session_run_invoke(bContext *C, wmOperator *op, const wmEvent *UN
 		}
 	}
 	if (!win) {
-		BLI_assert(0);
 		return (OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH);
 	}




More information about the Bf-blender-cvs mailing list