[Bf-blender-cvs] [827ccc3] master: Partial fix T45156: scaling region crash
Campbell Barton
noreply at git.blender.org
Mon Jun 29 08:56:55 CEST 2015
Commit: 827ccc343ffca44fb66a7b2f53f15b20598f63e5
Author: Campbell Barton
Date: Mon Jun 29 16:44:18 2015 +1000
Branches: master
https://developer.blender.org/rB827ccc343ffca44fb66a7b2f53f15b20598f63e5
Partial fix T45156: scaling region crash
'ar->winy' may not be initialized, making regions zoom in (past limits)
and attempt to draw very large text (~10x10k size characters), often crashing.
Fix isn't complete since it only corrects factory startup.
===================================================================
M source/blender/blenloader/intern/versioning_defaults.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 045f422..0e8e6e9 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -127,8 +127,9 @@ void BLO_update_defaults_startup_blend(Main *bmain)
/* simple fix for 3d view properties scrollbar being not set to top */
if (ar->regiontype == RGN_TYPE_UI) {
- ar->v2d.cur.ymax = ar->v2d.tot.ymax;
- ar->v2d.cur.ymin = ar->v2d.cur.ymax - ar->winy;
+ float offset = ar->v2d.tot.ymax - ar->v2d.cur.ymax;
+ ar->v2d.cur.ymax += offset;
+ ar->v2d.cur.ymin += offset;
}
}
}
More information about the Bf-blender-cvs
mailing list