archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T61204: Can't select Camera in stereoscopy mode

Browse Source 
This was deliberately disabled since I didn't get the drawing working
originally. It is fully working now.

Note: camera lens widget still needs to be fixed since it still draws it
wrongly.
This commit is contained in:
Dalai Felinto
2019-02-05 18:37:42 -02:00
parent 2778ecb58c
commit d1ef6be4a7
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/draw/modes/object_mode.c
View File

@@ -1868,22 +1868,23 @@ static void DRW_shgroup_camera(OBJECT_ShadingGroupList *sgl, Object *ob, ViewLay
if (look_through && !is_stereo3d_cameras) {
/* Only draw the frame. */
float mat[4][4];
if (is_selection_camera_stereo) {
/* Make sure selection uses the same matrix for camera as the one used while viewing. */
if (is_stereo3d) {
const bool is_left = v3d->multiview_eye == STEREO_LEFT_ID;
BKE_camera_multiview_model_matrix(&scene->r, ob, is_left ? STEREO_LEFT_NAME : STEREO_RIGHT_NAME, mat);
const char *view_name = is_left ? STEREO_LEFT_NAME : STEREO_RIGHT_NAME;
BKE_camera_multiview_model_matrix(&scene->r, ob, view_name, mat);
const float shiftx = BKE_camera_multiview_shift_x(&scene->r, ob, view_name);
cam->drwcorners[0][0][0] += shiftx;
cam->drwcorners[0][1][0] += shiftx;
cam->drwcorners[0][2][0] += shiftx;
cam->drwcorners[0][3][0] += shiftx;
}
else {
copy_m4_m4(mat, ob->obmat);
}
/* TODO (dfelinto): Disabling this for now since it is extremely wrong.
* Besides selection and multiview still works bad even on its finest day. */
if (!is_multiview) {
DRW_shgroup_call_dynamic_add(
sgl->camera_frame, color, cam->drwcorners[0],
&cam->drwdepth[0], cam->drwtria, mat);
}
DRW_shgroup_call_dynamic_add(
sgl->camera_frame, color, cam->drwcorners[0],
&cam->drwdepth[0], cam->drwtria, mat);
}
else if (!look_through) {
if (!is_stereo3d_cameras) {