diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-16 23:57:20 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-16 23:57:20 +0400 |
commit | 3ed866d2fc69e7c398e4b5f9bc9e2c06758d06cf (patch) | |
tree | c979010be379535c253a1fff6307daf8e6826996 /source/blender/editors/space_info | |
parent | 93581ab8159a0422403de67c35aa9ce8a11e8122 (diff) | |
parent | 3dcc9aef9685388255d4cf9d646830d573aeb932 (diff) |
svn merge -r41926:41932 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/space_info')
-rw-r--r-- | source/blender/editors/space_info/info_report.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/editors/space_info/info_report.c b/source/blender/editors/space_info/info_report.c index eab6cb5402f..206639f064a 100644 --- a/source/blender/editors/space_info/info_report.c +++ b/source/blender/editors/space_info/info_report.c @@ -220,6 +220,7 @@ static int borderselect_exec(bContext *C, wmOperator *op) ARegion *ar= CTX_wm_region(C); ReportList *reports= CTX_wm_reports(C); int report_mask= info_report_mask(sinfo); + int extend= RNA_boolean_get(op->ptr, "extend"); Report *report_min, *report_max, *report; //View2D *v2d= UI_view2d_fromcontext(C); @@ -244,6 +245,16 @@ static int borderselect_exec(bContext *C, wmOperator *op) UI_view2d_region_to_view(v2d, mval[0], mval[1], &rectf.xmax, &rectf.ymax); */ + if(!extend) { + for(report= reports->list.first; report; report= report->next) { + + if((report->type & report_mask)==0) + continue; + + report->flag &= ~SELECT; + } + } + report_min= info_text_pick(sinfo, ar, reports, rect.ymax); report_max= info_text_pick(sinfo, ar, reports, rect.ymin); @@ -308,7 +319,7 @@ void INFO_OT_select_border(wmOperatorType *ot) /* ot->flag= OPTYPE_REGISTER; */ /* rna */ - WM_operator_properties_gesture_border(ot, FALSE); + WM_operator_properties_gesture_border(ot, TRUE); } |