Revision: 38639
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38639
Author: nazgul
Date: 2011-07-23 18:59:18 +0000 (Sat, 23 Jul 2011)
Log Message:
-----------
Merging r38626 through r38638 from soc-2011-tomato into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38626
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38638
Modified Paths:
--------------
branches/soc-2011-salad/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_tracking.c
Property Changed:
----------------
branches/soc-2011-salad/
branches/soc-2011-salad/intern/audaspace/OpenAL/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38625
/trunk/blender:36834-38637
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38638
/trunk/blender:36834-38637
Property changes on: branches/soc-2011-salad/intern/audaspace/OpenAL
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins/intern/audaspace/OpenAL:28499-37009
/branches/soc-2010-nicolasbishop/intern/audaspace/OpenAL:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot/intern/audaspace/OpenAL:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620
/branches/soc-2011-cucumber/intern/audaspace/OpenAL:36829-36994
/branches/soc-2011-onion/intern/audaspace/OpenAL:36833-38309
/branches/soc-2011-pepper/intern/audaspace/OpenAL:36830-38208,38630
/branches/soc-2011-tomato/intern/audaspace/OpenAL:36831-38625
/trunk/blender/intern/audaspace/OpenAL:36834-38637
+ /branches/soc-2010-jwilkins/intern/audaspace/OpenAL:28499-37009
/branches/soc-2010-nicolasbishop/intern/audaspace/OpenAL:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot/intern/audaspace/OpenAL:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620
/branches/soc-2011-cucumber/intern/audaspace/OpenAL:36829-36994
/branches/soc-2011-onion/intern/audaspace/OpenAL:36833-38309
/branches/soc-2011-pepper/intern/audaspace/OpenAL:36830-38208,38630
/branches/soc-2011-tomato/intern/audaspace/OpenAL:36831-38638
/trunk/blender/intern/audaspace/OpenAL:36834-38637
Modified:
branches/soc-2011-salad/source/blender/editors/interface/interface_handlers.c
===================================================================
---
branches/soc-2011-salad/source/blender/editors/interface/interface_handlers.c
2011-07-23 18:55:53 UTC (rev 38638)
+++
branches/soc-2011-salad/source/blender/editors/interface/interface_handlers.c
2011-07-23 18:59:18 UTC (rev 38639)
@@ -254,7 +254,7 @@
static int ui_is_a_warp_but(uiBut *but)
{
if(U.uiflag & USER_CONTINUOUS_MOUSE)
- if(ELEM3(but->type, NUM, NUMABS, HSVCIRCLE))
+ if(ELEM4(but->type, NUM, NUMABS, HSVCIRCLE, TRACKPREVIEW))
return TRUE;
return FALSE;
@@ -4068,7 +4068,7 @@
return WM_UI_HANDLER_CONTINUE;
}
-static int ui_numedit_but_TRACKPREVIEW(bContext *C, uiBut *but,
uiHandleButtonData *data, int mx, int my)
+static int ui_numedit_but_TRACKPREVIEW(bContext *C, uiBut *but,
uiHandleButtonData *data, int mx, int my, int shift)
{
MovieClipScopes *scopes = (MovieClipScopes *)but->poin;
/* rcti rect; */
@@ -4078,6 +4078,11 @@
dx = mx - data->draglastx;
dy = my - data->draglasty;
+ if(shift) {
+ dx /= 5.0f;
+ dy /= 5.0f;
+ }
+
if (in_scope_resize_zone(but, data->dragstartx, data->dragstarty)) {
/* resize preview widget itself */
scopes->track_preview_height = (but->y2 - but->y1) +
(data->dragstarty - my);
@@ -4119,7 +4124,7 @@
button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
/* also do drag the first time */
- if(ui_numedit_but_TRACKPREVIEW(C, but, data, mx, my))
+ if(ui_numedit_but_TRACKPREVIEW(C, but, data, mx, my,
event->shift))
ui_numedit_apply(C, block, but, data);
return WM_UI_HANDLER_BREAK;
@@ -4133,7 +4138,7 @@
}
else if(event->type == MOUSEMOVE) {
if(mx!=data->draglastx || my!=data->draglasty) {
- if(ui_numedit_but_TRACKPREVIEW(C, but, data,
mx, my))
+ if(ui_numedit_but_TRACKPREVIEW(C, but, data,
mx, my, event->shift))
ui_numedit_apply(C, block, but, data);
}
}
Modified: branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c
2011-07-23 18:55:53 UTC (rev 38638)
+++ branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c
2011-07-23 18:59:18 UTC (rev 38639)
@@ -459,8 +459,8 @@
dy= 12.0f/height/sc->zoom;
if(sc->flag&SC_SHOW_MARKER_SEARCH) {
- tdx=MIN2(dx, (track->search_max[0]-track->search_min[0])/5);
- tdy=MIN2(dy, (track->search_max[1]-track->search_min[1])/5);
+ tdx=MIN2(dx, (track->search_max[0]-track->search_min[0])/3);
+ tdy=MIN2(dy, (track->search_max[1]-track->search_min[1])/3);
if(outline) {
tdx+= 1.0f/sc->zoom/width;
@@ -492,16 +492,16 @@
if(sc->flag&SC_SHOW_MARKER_PATTERN) {
float tdx2= 0, tdy2= 0;
/* use smaller slider for pattern area */
- dx= 10.0f/width/sc->zoom;
- dy= 10.0f/height/sc->zoom;
+ dx= 12.0f/width/sc->zoom;
+ dy= 12.0f/height/sc->zoom;
if(!outline) {
if(track->pat_flag&SELECT) glColor3fv(scol);
else glColor3fv(col);
}
- tdx=MIN2(dx, (track->pat_max[0]-track->pat_min[0])/5);
- tdy=MIN2(dy, (track->pat_max[1]-track->pat_min[1])/5);
+ tdx=MIN2(dx, (track->pat_max[0]-track->pat_min[0])/3);
+ tdy=MIN2(dy, (track->pat_max[1]-track->pat_min[1])/3);
if(outline) {
tdx+= 1.0f/sc->zoom/width;
Modified:
branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
2011-07-23 18:55:53 UTC (rev 38638)
+++ branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
2011-07-23 18:59:18 UTC (rev 38639)
@@ -2337,7 +2337,7 @@
track= clip->tracking.tracks.first;
while(track) {
- if(TRACK_SELECTED(track)) {
+ if(TRACK_SELECTED(track) && track!=sel) {
track->flag&= ~TRACK_CUSTOMCOLOR;
if(sel->flag&TRACK_CUSTOMCOLOR) {
Modified:
branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
2011-07-23 18:55:53 UTC (rev 38638)
+++ branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
2011-07-23 18:59:18 UTC (rev 38639)
@@ -1569,6 +1569,10 @@
const float scay= 1.0f / len_v3(ob->obmat[1]);
const float scaz= 1.0f / len_v3(ob->obmat[2]);
+ /* draw data for movie clip set as active for scene */
+ if(scene->clip)
+ draw_viewport_reconstruction(scene, base, v3d, scene->clip,
flag);
+
#ifdef VIEW3D_CAMERA_BORDER_HACK
if(is_view && !(G.f & G_PICKSEL)) {
glGetFloatv(GL_CURRENT_COLOR, view3d_camera_border_hack_col);
@@ -1638,10 +1642,6 @@
glVertex3fv(vec[4]);
glEnd();
- /* draw data for movie clip set as active for scene */
- if(scene->clip)
- draw_viewport_reconstruction(scene, base, v3d, scene->clip,
flag);
-
if(is_view)
return;
Modified: branches/soc-2011-salad/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- branches/soc-2011-salad/source/blender/makesrna/intern/rna_tracking.c
2011-07-23 18:55:53 UTC (rev 38638)
+++ branches/soc-2011-salad/source/blender/makesrna/intern/rna_tracking.c
2011-07-23 18:59:18 UTC (rev 38639)
@@ -347,16 +347,19 @@
prop= RNA_def_property(srna, "use_red_channel", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag",
TRACK_DISABLE_RED);
RNA_def_property_ui_text(prop, "Use Red Channel", "Use red channel from
footage for tracking");
+ RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
/* use_green_channel */
prop= RNA_def_property(srna, "use_green_channel", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag",
TRACK_DISABLE_GREEN);
RNA_def_property_ui_text(prop, "Use Green Channel", "Use green channel
from footage for tracking");
+ RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
/* use_blue_channel */
prop= RNA_def_property(srna, "use_blue_channel", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag",
TRACK_DISABLE_BLUE);
RNA_def_property_ui_text(prop, "Use Blue Channel", "Use blue channel
from footage for tracking");
+ RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
/* has bundle */
prop= RNA_def_property(srna, "has_bundle", PROP_BOOLEAN, PROP_NONE);
@@ -394,7 +397,7 @@
RNA_def_property_array(prop, 3);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Color", "Color of the track in the Clip
Editor");
- RNA_def_property_update(prop, NC_ANIMATION, NULL);
+ RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
}
static void rna_def_tracking(BlenderRNA *brna)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
