[Bf-blender-cvs] [3298792] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

[Dalai Felinto]

Commit: 329879239e6fa358e22bf92180e3d5ff9cee9ba1
Author: Dalai Felinto
Date:   Mon Jan 2 11:34:05 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB329879239e6fa358e22bf92180e3d5ff9cee9ba1

Merge remote-tracking branch 'origin/master' into blender2.8

I'm deliberately ignoring/reverting rB070f22c4 which in turns means T49861 is happening on 2.8

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



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

diff --cc source/blender/windowmanager/intern/wm_draw.c
index 0758fa8,77ffa46..df09331
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@@ -407,26 -416,21 +407,27 @@@ static bool wm_triple_gen_textures(wmWi
  
  	/* setup actual texture */
  	glBindTexture(triple->target, triple->bind);
 -	glTexImage2D(triple->target, 0, GL_RGB8, triple->x, triple->y, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
 +
 +	/* no mipmaps */
 +#if USE_TEXTURE_RECTANGLE
 +	/* already has no mipmaps */
 +#else
 +	glTexParameteri(triple->target, GL_TEXTURE_MAX_LEVEL, 0);
 +	/* GL_TEXTURE_BASE_LEVEL = 0 by default */
 +#endif
 +
  	glTexParameteri(triple->target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
  	glTexParameteri(triple->target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 -	glBindTexture(triple->target, 0);
  
 -	/* not sure if this works everywhere .. */
 -	if (glGetError() == GL_OUT_OF_MEMORY) {
 -		printf("WM: failed to allocate texture for triple buffer drawing (out of memory).\n");
 -		return 0;
 -	}
 +	glTexImage2D(triple->target, 0, GL_RGB8, triple->x, triple->y, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
 +
 +	glBindTexture(triple->target, 0);
  
 -	return 1;
 +	return true;
  }
  
- void wm_triple_draw_textures(wmWindow *win, wmDrawTriple *triple, float alpha)
 -void wm_triple_draw_textures(wmWindow *win, wmDrawTriple *triple, float alpha, bool is_interlace)
++/* TODO: fix interface - T49861 */
++void wm_triple_draw_textures(wmWindow *win, wmDrawTriple *triple, float alpha, bool UNUSED(is_interlace))
  {
  	const int sizex = WM_window_pixels_x(win);
  	const int sizey = WM_window_pixels_y(win);