[Bf-blender-cvs] [c34c688b475] blender2.8: Fix build: min and max not found.

Alexander Gavrilov noreply at git.blender.org
Mon Nov 12 17:38:57 CET 2018


Commit: c34c688b47521226503052616e8c1961b4d81acf
Author: Alexander Gavrilov
Date:   Mon Nov 12 19:36:18 2018 +0300
Branches: blender2.8
https://developer.blender.org/rBc34c688b47521226503052616e8c1961b4d81acf

Fix build: min and max not found.

===================================================================

M	source/blender/editors/interface/interface_draw.c

===================================================================

diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index d5ec60d1730..8c785f63978 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -1840,7 +1840,7 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti
 	immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
 
 	cmp = cuma->curve;
-	GPU_point_size(max(1.0f, min(UI_DPI_FAC / but->block->aspect * 4.0f, 4.0f)));
+	GPU_point_size(max_ff(1.0f, min_ff(UI_DPI_FAC / but->block->aspect * 4.0f, 4.0f)));
 	immBegin(GPU_PRIM_POINTS, cuma->totpoint);
 	for (int a = 0; a < cuma->totpoint; a++) {
 		float color[4];



More information about the Bf-blender-cvs mailing list