diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-10 16:06:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-10 16:06:24 +0400 |
| commit | 08ce2fe2da93ec55cd0bb110611df89905e1dbaf (patch) | |
| tree | b3523065729ffa7935eb6637f6238537a362fba7 /source/blender/editors/space_view3d | |
| parent | f22153d711e0d1c7136b6f9bb43d47745ed807fc (diff) | |
fix for error loading ruler info back from greasepencil.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_ruler.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index 3021932400e..8545f82c593 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -368,7 +368,7 @@ static bool view3d_ruler_from_gpencil(bContext *C, RulerInfo *ruler_info) } else if (gps->totpoints == 2) { RulerItem *ruler_item = ruler_item_add(ruler_info); - for (j = 0; j < 3; j++) { + for (j = 0; j < 3; j += 2) { copy_v3_v3(ruler_item->co[j], &pt->x); pt++; } @@ -732,7 +732,8 @@ static int view3d_ruler_invoke(bContext *C, wmOperator *op, wmEvent *event) op->customdata = ruler_info; ruler_info->ar = ar; - ruler_info->draw_handle_pixel = ED_region_draw_cb_activate(ar->type, ruler_info_draw_pixel, ruler_info, REGION_DRAW_POST_PIXEL); + ruler_info->draw_handle_pixel = ED_region_draw_cb_activate(ar->type, ruler_info_draw_pixel, + ruler_info, REGION_DRAW_POST_PIXEL); view3d_ruler_header_update(sa); @@ -794,7 +795,6 @@ static int view3d_ruler_modal(bContext *C, wmOperator *op, wmEvent *event) negate_v3_v3(ruler_item->co[0], rv3d->ofs); view3d_ruler_item_project(ruler_info, ruler_item->co[0], event->mval); - copy_v3_v3(ruler_item->co[2], ruler_item->co[0]); /* snap the first point added, not essential but handy */ { @@ -802,6 +802,7 @@ static int view3d_ruler_modal(bContext *C, wmOperator *op, wmEvent *event) view3d_ruler_item_mousemove(C, ruler_info, event->mval, true); } + copy_v3_v3(ruler_item->co[2], ruler_item->co[0]); ruler_item->co_index = 2; do_draw = true; |