Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2015-06-29 16:24:25 +0300
committerDalai Felinto <dfelinto@gmail.com>2015-06-29 16:24:25 +0300
commit3d12d4b94f9bff6ea810179e22a5e3e018541f31 (patch)
treeb7a0e7d2bc49c0d5757c8a8394b60ff99a9a2900 /release
parent295d0c52a26730edc6d4ed1276e4051cce006be5 (diff)
Fix T45234: Stereo Parallel vs. Off-Axis
Parallel rendering was not working. The idea of having parallel convergence mode to render as parallel but visualize as off-axis was good, but it was leading to some complications in the code. I think it's more clear to the user if parallel looks and render as parallel, and if she wants to pre-visualize the converged planes, simply temporarily set the camera to off-axis.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_data_camera.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index 24a67a22c1f..92ec34e01b2 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -153,10 +153,9 @@ class DATA_PT_camera_stereoscopy(CameraButtonsPanel, Panel):
col = layout.column()
col.row().prop(st, "convergence_mode", expand=True)
- if st.convergence_mode == 'PARALLEL':
- col.prop(st, "viewport_convergence")
- else:
- col.prop(st, "convergence_distance")
+ sub = col.column()
+ sub.active = st.convergence_mode == 'OFFAXIS'
+ sub.prop(st, "convergence_distance")
col.prop(st, "interocular_distance")