[Bf-blender-cvs] [07a1c20398] workspaces: Merge branch 'blender2.8' into workspaces

[Julian Eisel]

Commit: 07a1c203987263680e353b511f1ae249627dd1cd
Author: Julian Eisel
Date:   Fri Feb 24 00:57:17 2017 +0100
Branches: workspaces
https://developer.blender.org/rB07a1c203987263680e353b511f1ae249627dd1cd

Merge branch 'blender2.8' into workspaces

Conflicts:
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/workspace/screen_draw.c

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



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

diff --cc source/blender/editors/space_time/space_time.c
index bbe23adb60,986ac062b0..d39b8a323b
--- a/source/blender/editors/space_time/space_time.c
+++ b/source/blender/editors/space_time/space_time.c
@@@ -511,18 -467,8 +467,8 @@@ static void time_draw_keyframes(const b
  
  /* ---------------- */
  
- static void time_refresh(const bContext *UNUSED(C), ScrArea *sa)
- {
- 	/* find the main timeline region and refresh cache display*/
- 	ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
- 	if (ar) {
- 		SpaceTime *stime = (SpaceTime *)sa->spacedata.first;
- 		time_cache_refresh(stime);
- 	}
- }
- 
  /* editor level listener */
 -static void time_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
 +static void time_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, const Scene *UNUSED(scene))
  {
  
  	/* mainly for updating cache display */
diff --cc source/blender/editors/workspace/screen_draw.c
index c275008628,7ba3c4b82b..25ebf951a3
--- a/source/blender/editors/workspace/screen_draw.c
+++ b/source/blender/editors/workspace/screen_draw.c
@@@ -268,24 -296,27 +297,27 @@@ void ED_screen_draw(wmWindow *win
  	ScrArea *sa2 = NULL;
  	ScrArea *sa3 = NULL;
  
 -	wmSubWindowSet(win, win->screen->mainwin);
 +	wmSubWindowSet(win, screen->mainwin);
  
+ 	unsigned int pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 2, KEEP_FLOAT);
+ 	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ 
  	/* Note: first loop only draws if U.pixelsize > 1, skip otherwise */
  	if (U.pixelsize > 1.0f) {
  		/* FIXME: doesn't our glLineWidth already scale by U.pixelsize? */
  		glLineWidth((2.0f * U.pixelsize) - 1);
- 		glColor3ub(0x50, 0x50, 0x50);
- 		glBegin(GL_LINES);
- 		for (sa = screen->areabase.first; sa; sa = sa->next)
- 			drawscredge_area(sa, winsize_x, winsize_y);
- 		glEnd();
+ 		immUniformColor3ub(0x50, 0x50, 0x50);
+ 
 -		for (sa = win->screen->areabase.first; sa; sa = sa->next) {
++		for (sa = screen->areabase.first; sa; sa = sa->next) {
+ 			drawscredge_area(sa, winsize_x, winsize_y, pos);
+ 		}
  	}
  
  	glLineWidth(1);
- 	glColor3ub(0, 0, 0);
- 	glBegin(GL_LINES);
+ 	immUniformColor3ub(0, 0, 0);
+ 
 -	for (sa = win->screen->areabase.first; sa; sa = sa->next) {
 +	for (sa = screen->areabase.first; sa; sa = sa->next) {
- 		drawscredge_area(sa, winsize_x, winsize_y);
+ 		drawscredge_area(sa, winsize_x, winsize_y, pos);
  
  		/* gather area split/join info */
  		if (sa->flag & AREA_FLAG_DRAWJOINFROM) sa1 = sa;
@@@ -348,7 -396,9 +397,9 @@@
  		glDisable(GL_BLEND);
  	}
  
+ 	immUnbindProgram();
+ 
 -	win->screen->do_draw = false;
 +	screen->do_draw = false;
  }