Merge branch 'blender2.8' into transform-manipulatorstransform-manipulators

Conflicts:
	intern/gawain/gawain/immediate.h
	intern/gawain/src/immediate.c
	source/blender/editors/physics/physics_ops.c
	source/blender/editors/screen/glutil.c
	source/blender/editors/space_view3d/space_view3d.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_ops.c
	source/blender/editors/transform/transform_manipulator.c

1 files changed, 9 insertions, 0 deletions

diff --git a/source/blender/gpu/shaders/gpu_shader_simple_lighting_frag.glsl b/source/blender/gpu/shaders/gpu_shader_simple_lighting_frag.glsl
index 9828787fb04..4eacd08d5af 100644
--- a/source/blender/gpu/shaders/gpu_shader_simple_lighting_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_simple_lighting_frag.glsl
@@ -1,12 +1,21 @@
 
+#ifndef USE_INSTANCE_COLOR
 uniform vec4 color;
+#endif
 uniform vec3 light;
 
 #if __VERSION__ == 120
   varying vec3 normal;
+#ifdef USE_INSTANCE_COLOR
+  varying vec4 finalColor;
+#endif
   #define fragColor gl_FragColor
 #else
   in vec3 normal;
+#ifdef USE_INSTANCE_COLOR
+  flat in vec4 finalColor;
+  #define color finalColor
+#endif
   out vec4 fragColor;
 #endif