Revision: 48038
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48038
Author: nazgul
Date: 2012-06-18 14:02:59 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Disable mouse slide to control offset and uniform pattern scale for now
This is nice to have, but requires better approach for visualization.
Any ideas? :)
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_clip/clip_draw.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c 2012-06-18
13:46:57 UTC (rev 48037)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c 2012-06-18
14:02:59 UTC (rev 48038)
@@ -837,6 +837,9 @@
glEnable(GL_LINE_STIPPLE);
glLineStipple(3, 0xaaaa);
+#if 0
+ /* TODO: disable for now, needs better approach visualizing
this */
+
glBegin(GL_LINE_LOOP);
glVertex2f(pat_min[0] - dx, pat_min[1] - dy);
glVertex2f(pat_max[0] + dx, pat_min[1] - dy);
@@ -844,6 +847,13 @@
glVertex2f(pat_min[0] - dx, pat_max[1] + dy);
glEnd();
+ /* marker's offset slider */
+ draw_marker_slide_square(pat_min[0] - dx, pat_max[1] + dy,
patdx, patdy, outline, px);
+
+ /* pattern re-sizing triangle */
+ draw_marker_slide_triangle(pat_max[0] + dx, pat_min[1] - dy,
patdx, patdy, outline, px);
+#endif
+
glBegin(GL_LINES);
glVertex2f(0.0f, 0.0f);
glVertex2fv(tilt_ctrl);
@@ -851,12 +861,7 @@
glDisable(GL_LINE_STIPPLE);
- /* marker's offset slider */
- draw_marker_slide_square(pat_min[0] - dx, pat_max[1] + dy,
patdx, patdy, outline, px);
- /* pattern re-sizing triangle */
- draw_marker_slide_triangle(pat_max[0] + dx, pat_min[1] - dy,
patdx, patdy, outline, px);
-
/* slider to control pattern tilt */
draw_marker_slide_square(tilt_ctrl[0], tilt_ctrl[1], patdx,
patdy, outline, px);
}
Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c
2012-06-18 13:46:57 UTC (rev 48037)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c
2012-06-18 14:02:59 UTC (rev 48038)
@@ -575,6 +575,9 @@
ok = TRUE;
}
else {
+#if 0
+ /* TODO: disable for now, needs
better approaches for visualization */
+
if (mouse_on_corner(sc, marker,
TRACK_AREA_PAT, co, 1, 12.0f, width, height)) {
area = TRACK_AREA_PAT;
action =
SLIDE_ACTION_OFFSET;
@@ -585,6 +588,7 @@
action =
SLIDE_ACTION_SIZE;
ok = TRUE;
}
+#endif
if (!ok && mouse_on_tilt(sc,
marker, co, width, height)) {
area = TRACK_AREA_PAT;
action =
SLIDE_ACTION_TILT_SIZE;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
