[Bf-blender-cvs] [4edc9d5] master: Correct own error in recent quad-view ruler fix
Campbell Barton
noreply at git.blender.org
Mon May 4 10:33:31 CEST 2015
Commit: 4edc9d50fddd7119dd664d48ecb1086c7baf1e37
Author: Campbell Barton
Date: Mon May 4 18:32:47 2015 +1000
Branches: master
https://developer.blender.org/rB4edc9d50fddd7119dd664d48ecb1086c7baf1e37
Correct own error in recent quad-view ruler fix
===================================================================
M source/blender/editors/space_view3d/view3d_ruler.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c
index addda0a..98b1e84 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] */
More information about the Bf-blender-cvs
mailing list