archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T70317: Equal clip range crashing in Hue Correct & RGB Curves Nodes

Browse Source 
It takes many changes to support the drawing of zero-sized curves.
Best skip these cases to avoid crash.
Blender 2.79 had no support either.
This commit is contained in:
Germano Cavalcante
2019-10-01 12:26:38 -03:00
parent b155ece0c0
commit 825a93d7cd
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/interface/interface_draw.c
View File

@@ -1849,9 +1849,17 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, const uiWidgetColors *wcol, cons
cumap = (CurveMapping *)but->poin; cumap = (CurveMapping *)but->poin;
} }
float clip_size_x = BLI_rctf_size_x(&cumap->curr);
float clip_size_y = BLI_rctf_size_y(&cumap->curr);
/* zero-sized curve */
if (clip_size_x == 0.0f || clip_size_y == 0.0f) {
return;
}
/* calculate offset and zoom */ /* calculate offset and zoom */
float zoomx = (BLI_rcti_size_x(rect) - 2.0f) / BLI_rctf_size_x(&cumap->curr); float zoomx = (BLI_rcti_size_x(rect) - 2.0f) / clip_size_x;
float zoomy = (BLI_rcti_size_y(rect) - 2.0f) / BLI_rctf_size_y(&cumap->curr); float zoomy = (BLI_rcti_size_y(rect) - 2.0f) / clip_size_y;
float offsx = cumap->curr.xmin - (1.0f / zoomx); float offsx = cumap->curr.xmin - (1.0f / zoomx);
float offsy = cumap->curr.ymin - (1.0f / zoomy); float offsy = cumap->curr.ymin - (1.0f / zoomy);