Merge branch 'blender2.8' of git.blender.org:blender into blender2.8

source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl

@@ -28,7 +28,7 @@ void main()
 #else /* !V3D_DRAWOPTION_OBJECT_OVERLAP */
 	uint object_id = depth == 1.0? NO_OBJECT_ID: texelFetch(objectId, texel, 0).r;
 	float object_overlap = calculate_object_overlap(objectId, texel, object_id);
-	
+
 	if (object_id == NO_OBJECT_ID) {
 		vec3 background = background_color(world_data, uv_viewport.y);
 		if (object_overlap == 0.0) {

source/blender/draw/engines/workbench/shaders/workbench_object_overlap_lib.glsl

@@ -10,4 +10,4 @@ float calculate_object_overlap(usampler2D objectId, ivec2 texel, uint object_id)
 	    texelFetchOffset(objectId, texel, 0, ivec2( OBJECT_OVERLAP_OFFSET, 0)).r);
 
 	return dot(vec4(equal(uvec4(object_id), oid_offset)), vec4(1.0/4.0));
-}
+}