[Bf-blender-cvs] [e35a26f] master: Fix T45156: scaling region crash
Campbell Barton
noreply at git.blender.org
Mon Jun 29 12:52:39 CEST 2015
Commit: e35a26fbef2ad3eb1c1e5e9432ca41b2a560a9e6
Author: Campbell Barton
Date: Mon Jun 29 20:46:23 2015 +1000
Branches: master
https://developer.blender.org/rBe35a26fbef2ad3eb1c1e5e9432ca41b2a560a9e6
Fix T45156: scaling region crash
===================================================================
M source/blender/editors/screen/screen_ops.c
===================================================================
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 52eb14a..e5c3cb4 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);
}
More information about the Bf-blender-cvs
mailing list