[Bf-blender-cvs] [778db43b8ff] sculpt-dev: Sculpt-dev: another merge error

[Joseph Eagar]

Commit: 778db43b8ff249f84b9e4065f7ff15f17b563242
Author: Joseph Eagar
Date:   Mon Jan 31 09:39:21 2022 -0800
Branches: sculpt-dev
https://developer.blender.org/rB778db43b8ff249f84b9e4065f7ff15f17b563242

Sculpt-dev: another merge error

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

M	source/blender/draw/intern/shaders/common_view_lib.glsl

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

diff --git a/source/blender/draw/intern/shaders/common_view_lib.glsl b/source/blender/draw/intern/shaders/common_view_lib.glsl
index 221fa085b17..d4d18b95238 100644
--- a/source/blender/draw/intern/shaders/common_view_lib.glsl
+++ b/source/blender/draw/intern/shaders/common_view_lib.glsl
@@ -183,7 +183,6 @@ layout(std140) uniform modelBlock
 {
   ObjectMatrices drw_matrices[DRW_RESOURCE_CHUNK_LEN];
 };
-#  endif /* DRW_SHADER_SHARED_H */
 
 #    define ModelMatrix (drw_matrices[resource_id].drw_modelMatrix)
 #    define ModelMatrixInverse (drw_matrices[resource_id].drw_modelMatrixInverse)