Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2022-06-27 13:46:05 +0300
committerClément Foucault <foucault.clem@gmail.com>2022-06-27 13:46:47 +0300
commit2b806cb9558f174fb4b2fa7254ca2e9e113bfd17 (patch)
treeef4db479ec7654ccf3edc4bfd7b4b70371ca4802 /source/blender/draw/engines/gpencil
parentddc6b86a5bab833c7599f5545b9aff0ad7349e02 (diff)
Cleanup: DRW: Remove drw_view renaming MACROS
Diffstat (limited to 'source/blender/draw/engines/gpencil')
-rw-r--r--source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl2
-rw-r--r--source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
index 75bd3d30d68..6671c16aa0b 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
@@ -344,7 +344,7 @@ float stroke_thickness_modulate(float thickness)
}
else {
/* World space point size. */
- thickness *= thicknessWorldScale * ProjectionMatrix[1][1] * sizeViewport.y;
+ thickness *= thicknessWorldScale * drw_view.winmat[1][1] * sizeViewport.y;
}
return thickness;
}
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl
index e162c5bf45e..2fca8b69183 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl
@@ -5,5 +5,5 @@ void main()
int v = gl_VertexID % 3;
float x = -1.0 + float((v & 1) << 2);
float y = -1.0 + float((v & 2) << 1);
- gl_Position = ViewProjectionMatrix * (model_matrix * vec4(x, y, 0.0, 1.0));
+ gl_Position = drw_view.persmat * (model_matrix * vec4(x, y, 0.0, 1.0));
}