diff options
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/armature_add.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_slide.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c index 7a14de2b240..2ebe7d6f144 100644 --- a/source/blender/editors/armature/armature_add.c +++ b/source/blender/editors/armature/armature_add.c @@ -228,13 +228,13 @@ static int armature_click_extrude_invoke(bContext *C, wmOperator *op, const wmEv /* temporarily change 3d cursor position */ Scene *scene; - ARegion *ar; + ARegion *region; View3D *v3d; float tvec[3], oldcurs[3], mval_f[2]; int retv; scene = CTX_data_scene(C); - ar = CTX_wm_region(C); + region = CTX_wm_region(C); v3d = CTX_wm_view3d(C); View3DCursor *cursor = &scene->cursor; @@ -242,7 +242,7 @@ static int armature_click_extrude_invoke(bContext *C, wmOperator *op, const wmEv copy_v3_v3(oldcurs, cursor->location); copy_v2fl_v2i(mval_f, event->mval); - ED_view3d_win_to_3d(v3d, ar, cursor->location, mval_f, tvec); + ED_view3d_win_to_3d(v3d, region, cursor->location, mval_f, tvec); copy_v3_v3(cursor->location, tvec); /* extrude to the where new cursor is and store the operation result */ diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index 4c64f9c7248..8463f0ef827 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -88,7 +88,7 @@ typedef struct tPoseSlideOp { /** area that we're operating in (needed for modal()) */ ScrArea *sa; /** region that we're operating in (needed for modal()) */ - ARegion *ar; + ARegion *region; /** len of the PoseSlideObject array. */ uint objects_len; @@ -197,8 +197,8 @@ static int pose_slide_init(bContext *C, wmOperator *op, ePoseSlide_Modes mode) /* get info from context */ pso->scene = CTX_data_scene(C); - pso->sa = CTX_wm_area(C); /* only really needed when doing modal() */ - pso->ar = CTX_wm_region(C); /* only really needed when doing modal() */ + pso->sa = CTX_wm_area(C); /* only really needed when doing modal() */ + pso->region = CTX_wm_region(C); /* only really needed when doing modal() */ pso->cframe = pso->scene->r.cfra; pso->mode = mode; @@ -1004,7 +1004,7 @@ static void pose_slide_mouse_update_percentage(tPoseSlideOp *pso, wmOperator *op, const wmEvent *event) { - pso->percentage = (event->x - pso->ar->winrct.xmin) / ((float)pso->ar->winx); + pso->percentage = (event->x - pso->region->winrct.xmin) / ((float)pso->region->winx); RNA_float_set(op->ptr, "percentage", pso->percentage); } |