Commit dc15e3af authored by Dalai Felinto's avatar Dalai Felinto
Browse files

Merge remote-tracking branch 'origin/master' into debug

parents bcf260d7 a5cfd9af
...@@ -202,10 +202,7 @@ class VirtualRealityDisplayOperator(bpy.types.Operator): ...@@ -202,10 +202,7 @@ class VirtualRealityDisplayOperator(bpy.types.Operator):
self._hmd.quit() self._hmd.quit()
if self._slave_window: if self._slave_window:
if hasattr(self._slave_window, "close"): self._slave_window.close()
self._slave_window.close()
else:
print("Error closing HMD window")
# cleanup viewport # cleanup viewport
if context.area: if context.area:
...@@ -414,10 +411,7 @@ class VirtualRealityDisplayOperator(bpy.types.Operator): ...@@ -414,10 +411,7 @@ class VirtualRealityDisplayOperator(bpy.types.Operator):
modelview_matrix = self._hmd.modelview_matrix modelview_matrix = self._hmd.modelview_matrix
# drawing # drawing
try: offscreen.draw_view3d(scene, view3d, region, projection_matrix, modelview_matrix)
offscreen.draw_view3d(projection_matrix, modelview_matrix)
except:
offscreen.draw_view3d(scene, view3d, region, projection_matrix, modelview_matrix)
self._hmd.frameReady() self._hmd.frameReady()
self._is_rendering = False self._is_rendering = False
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment