[Bf-blender-cvs] [701c3e499f6] master: Cleanup: correct naming IMAGE_Z_DEPTH
Jeroen Bakker
noreply at git.blender.org
Mon Sep 21 07:54:28 CEST 2020
Commit: 701c3e499f61f9400b5f1c570fbbe04dfa21f158
Author: Jeroen Bakker
Date: Mon Sep 21 07:53:40 2020 +0200
Branches: master
https://developer.blender.org/rB701c3e499f61f9400b5f1c570fbbe04dfa21f158
Cleanup: correct naming IMAGE_Z_DEPTH
IMAGE_DEPTH is used for bit depth.
===================================================================
M source/blender/draw/engines/image/shaders/engine_image_vert.glsl
===================================================================
diff --git a/source/blender/draw/engines/image/shaders/engine_image_vert.glsl b/source/blender/draw/engines/image/shaders/engine_image_vert.glsl
index dbc8105bcf5..044cbc9b37f 100644
--- a/source/blender/draw/engines/image/shaders/engine_image_vert.glsl
+++ b/source/blender/draw/engines/image/shaders/engine_image_vert.glsl
@@ -2,7 +2,7 @@
#define SIMA_DRAW_FLAG_DO_REPEAT (1 << 4)
-#define DEPTH_IMAGE 0.75
+#define IMAGE_Z_DEPTH 0.75
uniform int drawFlags;
@@ -16,7 +16,7 @@ void main()
vec3 image_pos = pos * 0.5 + 0.5;
if ((drawFlags & SIMA_DRAW_FLAG_DO_REPEAT) != 0) {
- gl_Position = vec4(pos.xy, DEPTH_IMAGE, 1.0);
+ gl_Position = vec4(pos.xy, IMAGE_Z_DEPTH, 1.0);
uvs = point_view_to_object(image_pos).xy;
}
else {
@@ -26,7 +26,7 @@ void main()
* to detect if a transparency texture or the background color should be drawn.
* Vertices are between 0.0 and 0.2, Edges between 0.2 and 0.4
* actual pixels are at 0.75, 1.0 is used for the background. */
- position.z = DEPTH_IMAGE;
+ position.z = IMAGE_Z_DEPTH;
gl_Position = position;
uvs = world_pos.xy;
}
More information about the Bf-blender-cvs
mailing list