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>2019-11-06 23:49:17 +0300
committerDalai Felinto <dfelinto@gmail.com>2019-11-06 23:49:17 +0300
commitaf33dbd7145098fecf32d7a0b57c93d3cb63dc18 (patch)
treed199d1e3a7c6356d37c175131be31a40ae08b2fb /source/blender/draw
parent3ed40972920dc6bf6d37c1d0aaf2c569c76f38e4 (diff)
parent85637311c28f49b55286d3287d4c7cefbcbca18a (diff)
Merge remote-tracking branch 'origin/blender-v2.81-release'
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/modes/object_mode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index fe17019a5b5..781c7e6a488 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2099,7 +2099,8 @@ static void camera_view3d_stereoscopy_display_extra(OBJECT_ShadingGroupList *sgl
if (cam->stereo.convergence_mode == CAM_S3D_OFFAXIS) {
const float shift_x = ((BKE_camera_multiview_shift_x(&scene->r, ob, viewnames[eye]) -
cam->shiftx) *
- (drawsize * scale[0] * fac));
+ (drawsize * scale[0] * fac)) *
+ (cam->stereo.pivot == CAM_S3D_PIVOT_CENTER ? 1.0f : 2.0f);
for (int i = 0; i < 4; i++) {
cam->runtime.drw_corners[eye][i][0] += shift_x;