[Bf-blender-cvs] [9c91c75ea65] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 9c91c75ea6514bbc500ae69083f25874b60e1470
Author: Campbell Barton
Date:   Thu Jan 11 13:24:41 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB9c91c75ea6514bbc500ae69083f25874b60e1470

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/interface/interface_widgets.c
index cc4f53cbabf,b25e1130c60..3afae5ed8d4
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@@ -777,13 -753,19 +778,14 @@@ static void widgetbase_draw(uiWidgetBas
  				round_box_shade_col4_r(col_pt, col1, col2, wtb->inner_uv[a][wtb->draw_shadedir ? 1 : 0]);
  			}
  
 -			glEnableClientState(GL_VERTEX_ARRAY);
 -			glEnableClientState(GL_COLOR_ARRAY);
 -			glVertexPointer(2, GL_FLOAT, 0, wtb->inner_v);
 -			glColorPointer(4, GL_UNSIGNED_BYTE, 0, col_array);
 -			glDrawArrays(GL_POLYGON, 0, wtb->totvert);
 -			glDisableClientState(GL_VERTEX_ARRAY);
 -			glDisableClientState(GL_COLOR_ARRAY);
 +			widget_draw_vertex_buffer(pos, col, GL_TRIANGLE_FAN, wtb->inner_v, col_array, wtb->totvert);
 +			immUnbindProgram();
  		}
  	}
 -	
 +
  	/* for each AA step */
  	if (wtb->draw_outline) {
+ 		BLI_assert(wtb->totvert != 0);
  		float triangle_strip[WIDGET_SIZE_MAX * 2 + 2][2]; /* + 2 because the last pair is wrapped */
  		float triangle_strip_emboss[WIDGET_SIZE_MAX * 2][2]; /* only for emboss */