Merge branch 'blender-v4.3-release'

2024-10-16 21:08:15 +11:00
parent 363b2f31b6 30adc33730
commit 10960b99c9
1 changed files with 2 additions and 3 deletions
--- a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert_no_geom.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert_no_geom.glsl
@@ -220,9 +220,8 @@ void main(void)
  for (int i = 0; i < 4; i++) {
    finalPos[i] = ModelViewProjectionMatrix *
                  vec4(vertex_fetch_attribute(input_prim_id + i, pos, vec3).xyz, 1.0);
-    /* Color attribute uses GPU_FETCH_INT_TO_FLOAT_UNIT with GPU_COMP_U8. */
-    finalColor[i] = uchar4_to_normalized_vec4(
-        vertex_fetch_attribute(input_prim_id + i, color, uchar4));
+    /* Attribute is expected to be in the float4 format. */
+    finalColor[i] = vertex_fetch_attribute(input_prim_id + i, color, float4);
    float in_thickness = vertex_fetch_attribute(input_prim_id + i, thickness, float);

    if (gpencil_stroke_data.keep_size) {