From 227e1429e8a4c9c3f1485924f3713bd502424cc2 Mon Sep 17 00:00:00 2001
From: Dilith Jayakody <dilithjay@gmail.com>
Date: Tue, 20 Jul 2021 20:23:34 +0530
Subject: Merge branch 'master' into soc-2021-curves

---
 source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl')

diff --git a/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl b/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl
index d7996ab4bd1..c935eca6a39 100644
--- a/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl
@@ -37,7 +37,7 @@ layout(std140) uniform common_block
   int prbIrradianceVisSize;
   float prbIrradianceSmooth;
   float prbLodCubeMax;
-  /* Misc*/
+  /* Misc */
   int rayType;
   float rayDepth;
   float alphaHashOffset;
-- 
cgit v1.2.3