Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Dalai Felinto
virtual_reality_viewport
Commits
dc15e3af
Commit
dc15e3af
authored
Oct 20, 2015
by
Dalai Felinto
Browse files
Merge remote-tracking branch 'origin/master' into debug
parents
bcf260d7
a5cfd9af
Changes
1
Hide whitespace changes
Inline
Side-by-side
space_view3d_virtual_reality/operator.py
View file @
dc15e3af
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment