Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-05-04 11:32:47 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-05-04 11:32:47 +0300
commit4edc9d50fddd7119dd664d48ecb1086c7baf1e37 (patch)
tree85d61196aeb1f1e2a2a783aa60646e18e3cc7bf0 /source/blender/editors/space_view3d/view3d_ruler.c
parent74dc4e87a6df2826f26eb94eaff8fe02a3911c24 (diff)
Correct own error in recent quad-view ruler fix
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_ruler.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_ruler.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c
index addda0a8b66..98b1e846c70 100644
--- a/source/blender/editors/space_view3d/view3d_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_ruler.c
@@ -188,8 +188,8 @@ typedef struct RulerInfo {
/* wm state */
wmWindow *win;
ScrArea *sa;
- ARegion *ar;
void *draw_handle_pixel;
+ ARegion *ar; /* re-assigned every modal update */
} RulerInfo;
/* -------------------------------------------------------------------- */
@@ -828,7 +828,7 @@ static int view3d_ruler_modal(bContext *C, wmOperator *op, const wmEvent *event)
int exit_code = OPERATOR_RUNNING_MODAL;
RulerInfo *ruler_info = op->customdata;
ScrArea *sa = CTX_wm_area(C);
- ARegion *ar = ruler_info->ar;
+ ARegion *ar = CTX_wm_region(C);
RegionView3D *rv3d = ar->regiondata;
/* its possible to change spaces while running the operator [#34894] */