tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Don't show 2D cursor in tracking mode i pivoting is not set to 2D cursor

This commit is contained in:
Sergey Sharybin 2013-09-10 12:46:23 +00:00
parent e72c6f191f
commit c4e4329f29
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_clip/clip_ops.c
View File

@ -1464,6 +1464,14 @@ void CLIP_OT_set_scene_frames(wmOperatorType *ot)
static int clip_set_2d_cursor_exec(bContext *C, wmOperator *op)
{
SpaceClip *sclip = CTX_wm_space_clip(C);
bool show_cursor = false;
show_cursor |= sclip->mode == SC_MODE_MASKEDIT;
show_cursor |= sclip->around == V3D_CURSOR;
if (!show_cursor) {
return OPERATOR_CANCELLED;
}
RNA_float_get_array(op->ptr, "location", sclip->cursor);

20
source/blender/editors/space_clip/space_clip.c
View File

@ -1129,6 +1129,7 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
MovieClip *clip = ED_space_clip_get_clip(sc);
float aspx, aspy, zoomx, zoomy, x, y;
int width, height;
bool show_cursor = false;
/* if tracking is in progress, we should synchronize framenr from clipuser
* so latest tracked frame would be shown */
@ -1181,13 +1182,18 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
}
}
glPushMatrix();
glTranslatef(x, y, 0);
glScalef(zoomx, zoomy, 0);
glMultMatrixf(sc->stabmat);
glScalef(width, height, 0);
draw_image_cursor(ar, sc->cursor);
glPopMatrix();
show_cursor |= sc->mode == SC_MODE_MASKEDIT;
show_cursor |= sc->around == V3D_CURSOR;
if (show_cursor) {
glPushMatrix();
glTranslatef(x, y, 0);
glScalef(zoomx, zoomy, 0);
glMultMatrixf(sc->stabmat);
glScalef(width, height, 0);
draw_image_cursor(ar, sc->cursor);
glPopMatrix();
}
if (sc->flag & SC_SHOW_GPENCIL) {
/* Grease Pencil */