sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

View2D could potentially divide stuff by zero, giving bad matrices.

Browse Source
This commit is contained in:
Ton Roosendaal 2013-04-18 10:22:42 +00:00
parent dfa30f8207
commit bde6a939e6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/interface/view2d.c
View File

@ -1022,15 +1022,19 @@ static void view2d_map_cur_using_mask(View2D *v2d, rctf *curmasked)
void UI_view2d_view_ortho(View2D *v2d)
{
rctf curmasked;
float xofs, yofs;
int sizex = BLI_rcti_size_x(&v2d->mask);
int sizey = BLI_rcti_size_y(&v2d->mask);
float xofs = 0.0f, yofs = 0.0f;
/* pixel offsets (-GLA_PIXEL_OFS) are needed to get 1:1 correspondence with pixels for smooth UI drawing,
* but only applied where requested
*/
/* XXX brecht: instead of zero at least use a tiny offset, otherwise
* pixel rounding is effectively random due to float inaccuracy */
xofs = 0.001f * BLI_rctf_size_x(&v2d->cur) / BLI_rcti_size_x(&v2d->mask);
yofs = 0.001f * BLI_rctf_size_y(&v2d->cur) / BLI_rcti_size_y(&v2d->mask);
if (sizex > 0)
xofs = 0.001f * BLI_rctf_size_x(&v2d->cur) / BLI_rcti_size_x(&v2d->mask);
if (sizey > 0)
yofs = 0.001f * BLI_rctf_size_y(&v2d->cur) / BLI_rcti_size_y(&v2d->mask);
/* apply mask-based adjustments to cur rect (due to scrollers), to eliminate scaling artifacts */
view2d_map_cur_using_mask(v2d, &curmasked);