From c706d1ab7a8d180cf91cf4d9eb3848a58278ddef Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 29 Jun 2015 20:46:23 +1000 Subject: Fix T45156: scaling region crash --- source/blender/editors/screen/screen_ops.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 52eb14aab8d..e5c3cb4e5e2 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -81,6 +81,7 @@ #include "UI_interface.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "screen_intern.h" /* own module include */ @@ -1929,6 +1930,12 @@ static void region_scale_validate_size(RegionMoveData *rmd) static void region_scale_toggle_hidden(bContext *C, RegionMoveData *rmd) { + /* hidden areas may have bad 'View2D.cur' value, + * correct before displaying. see T45156 */ + if (rmd->ar->flag & RGN_FLAG_HIDDEN) { + UI_view2d_curRect_validate(&rmd->ar->v2d); + } + region_toggle_hidden(C, rmd->ar, 0); region_scale_validate_size(rmd); } -- cgit v1.2.3