[Bf-blender-cvs] [10d57f9] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 10d57f991b06ae7c0a0b5e492eec8c7163debf80
Author: Campbell Barton
Date:   Fri Jun 10 05:15:06 2016 +1000
Branches: blender2.8
https://developer.blender.org/rB10d57f991b06ae7c0a0b5e492eec8c7163debf80

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/gpu/GPU_basic_shader.h
index b9335ca,1e2db6a..fa53a01
--- a/source/blender/gpu/GPU_basic_shader.h
+++ b/source/blender/gpu/GPU_basic_shader.h
@@@ -46,12 -46,12 +46,13 @@@ typedef enum GPUBasicShaderOption 
  	GPU_SHADER_LIGHTING =         (1 << 1),   /* use lighting */
  	GPU_SHADER_TWO_SIDED =        (1 << 2),   /* flip normals towards viewer */
  	GPU_SHADER_TEXTURE_2D =       (1 << 3),   /* use 2D texture to replace diffuse color */
+ 	GPU_SHADER_TEXTURE_RECT =     (1 << 4),   /* same as GPU_SHADER_TEXTURE_2D, for GL_TEXTURE_RECTANGLE */
  
- 	GPU_SHADER_SOLID_LIGHTING =   (1 << 4),   /* use faster lighting (set automatically) */
- 	GPU_SHADER_STIPPLE =          (1 << 5),   /* use stipple */
- 	GPU_SHADER_LINE =             (1 << 6),   /* draw lines */
- 	GPU_SHADER_FLAT_NORMAL =      (1 << 7),   /* use flat normals */
- 	GPU_SHADER_OPTIONS_NUM = 8,
+ 	GPU_SHADER_SOLID_LIGHTING =   (1 << 5),   /* use faster lighting (set automatically) */
+ 	GPU_SHADER_STIPPLE =          (1 << 6),   /* use stipple */
+ 	GPU_SHADER_LINE =             (1 << 7),   /* draw lines */
 -	GPU_SHADER_OPTIONS_NUM = 8,
++	GPU_SHADER_FLAT_NORMAL =      (1 << 8),   /* use flat normals */
++	GPU_SHADER_OPTIONS_NUM = 9,
  	GPU_SHADER_OPTION_COMBINATIONS = (1 << GPU_SHADER_OPTIONS_NUM)
  } GPUBasicShaderOption;