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

From review: rename 'eye' to 'multiview_eye'

Browse Source
This commit is contained in:
Dalai Felinto
2014-11-26 10:54:25 -02:00
parent 289c8d6c6c
commit a74c5742cc
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/image.c
View File

@@ -2631,7 +2631,7 @@ RenderPass *BKE_image_multilayer_index(RenderResult *rr, ImageUser *iuser)
short index = 0, rv_index, rl_index = 0, rp_index;
bool is_stereo = (iuser->flag & IMA_SHOW_STEREO) && RE_RenderResult_is_stereo(rr);
rv_index = is_stereo ? iuser->eye : iuser->view;
rv_index = is_stereo ? iuser->multiview_eye : iuser->view;
for (rl = rr->layers.first; rl; rl = rl->next, rl_index++) {
rp_index = 0;
@@ -2671,7 +2671,7 @@ void BKE_image_multiview_index(Image *ima, ImageUser *iuser)
if (iuser) {
bool is_stereo = (ima->flag & IMA_IS_STEREO) && (iuser->flag & IMA_SHOW_STEREO);
if (is_stereo) {
iuser->multi_index = iuser->eye;
iuser->multi_index = iuser->multiview_eye;
}
else {
if ((iuser->view < 0) || (iuser->view >= BLI_listbase_count_ex(&ima->views, iuser->view + 1))) {
@@ -3458,7 +3458,7 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
actview = iuser->view;
if ((ima->flag & IMA_IS_STEREO) && (iuser->flag & IMA_SHOW_STEREO))
actview = iuser->eye;
actview = iuser->multiview_eye;
if (from_render) {
RE_AcquireResultImage(re, &rres, actview);

2
source/blender/editors/space_sequencer/sequencer_draw.c
View File

@@ -1003,7 +1003,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
return;
/* for now we only support Left/Right */
ibuf = sequencer_ibuf_get(bmain, scene, sseq, cfra, frame_ofs, names[sseq->eye]);
ibuf = sequencer_ibuf_get(bmain, scene, sseq, cfra, frame_ofs, names[sseq->multiview_eye]);
if (ibuf == NULL)
return;

8
source/blender/editors/space_view3d/view3d_draw.c
View File

@@ -1592,11 +1592,11 @@ static void view3d_stereo_bgpic_setup(Scene *scene, View3D *v3d, Image *ima, Ima
iuser->flag |= IMA_SHOW_STEREO;
if ((scene->r.scemode & R_MULTIVIEW) == 0)
iuser->eye = STEREO_LEFT_ID;
iuser->multiview_eye = STEREO_LEFT_ID;
/* show only left or right camera */
else if (v3d->stereo3d_camera != STEREO_3D_ID)
iuser->eye = v3d->stereo3d_camera;
iuser->multiview_eye = v3d->stereo3d_camera;
BKE_image_multiview_index(ima, iuser);
}
@@ -3445,9 +3445,9 @@ static void view3d_stereo3d_setup(Scene *scene, View3D *v3d, ARegion *ar)
/* show only left or right camera */
if (v3d->stereo3d_camera != STEREO_3D_ID)
v3d->eye = v3d->stereo3d_camera;
v3d->multiview_eye = v3d->stereo3d_camera;
is_left = v3d->eye == STEREO_LEFT_ID;
is_left = v3d->multiview_eye == STEREO_LEFT_ID;
viewname = names[is_left ? STEREO_LEFT_ID : STEREO_RIGHT_ID];
/* update the viewport matrices with the new camera */

2
source/blender/makesdna/DNA_image_types.h
View File

@@ -55,7 +55,7 @@ typedef struct ImageUser {
char fie_ima, cycl; /* fields/image in movie, cyclic flag */
char ok;
char eye; /* multiview current eye - for internal use */
char multiview_eye; /* multiview current eye - for internal use of drawing routines */
short multi_index, view, layer, pass; /* listbase indices, for menu browsing or retrieve buffer */

2
source/blender/makesdna/DNA_space_types.h
View File

@@ -504,7 +504,7 @@ typedef struct SpaceSeq {
struct SequencerScopes scopes; /* different scoped displayed in space */
char eye; /* multiview current eye - for internal use */
char multiview_eye; /* multiview current eye - for internal use */
char pad2[7];
} SpaceSeq;

2
source/blender/makesdna/DNA_view3d_types.h
View File

@@ -213,7 +213,7 @@ typedef struct View3D {
/* drawflags, denoting state */
char zbuf, transp, xray;
char eye; /* multiview current eye - for internal use */
char multiview_eye; /* multiview current eye - for internal use */
char pad3[4];
void *properties_storage; /* Nkey panel stores stuff here (runtime only!) */

8
source/blender/windowmanager/intern/wm_draw.c
View File

@@ -769,15 +769,15 @@ static void wm_method_draw_triple_multiview(bContext *C, wmWindow *win, StereoVi
case SPACE_IMAGE:
{
SpaceImage *sima = sa->spacedata.first;
sima->iuser.eye = sview;
sima->iuser.multiview_eye = sview;
break;
}
case SPACE_VIEW3D:
{
View3D *v3d = sa->spacedata.first;
BGpic *bgpic = v3d->bgpicbase.first;
v3d->eye = sview;
if (bgpic) bgpic->iuser.eye = sview;
v3d->multiview_eye = sview;
if (bgpic) bgpic->iuser.multiview_eye = sview;
break;
}
case SPACE_NODE:
@@ -792,7 +792,7 @@ static void wm_method_draw_triple_multiview(bContext *C, wmWindow *win, StereoVi
case SPACE_SEQ:
{
SpaceSeq *sseq = sa->spacedata.first;
sseq->eye = sview;
sseq->multiview_eye = sview;
break;
}
}