Sculpt-dev: another merge error

2022-01-31 09:39:21 -08:00 · 2022-01-31 09:39:21 -08:00 · 778db43b8f
parent 5854892d95
commit 778db43b8f
1 changed files with 0 additions and 1 deletions
--- 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)