[Bf-blender-cvs] [2c6e50c6c0c] sculpt-mode-features: Fix PBVH sculpt vertex color drawing

[Pablo Dobarro]

Commit: 2c6e50c6c0c77d42b59f6fb1f0b8bb2ae800534c
Author: Pablo Dobarro
Date:   Mon Jul 15 19:12:17 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rB2c6e50c6c0c77d42b59f6fb1f0b8bb2ae800534c

Fix PBVH sculpt vertex color drawing

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

M	source/blender/gpu/intern/gpu_buffers.c
M	source/blender/gpu/intern/gpu_extensions.c

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

diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index a1c4ff8eceb..c816cc46b4e 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -138,7 +138,7 @@ static bool gpu_pbvh_vert_buf_data_set(GPU_PBVH_Buffers *buffers, uint vert_len)
       /* TODO: Do not allocate these `.msk` and `.col` when they are not used. */
       g_vbo_id.msk = GPU_vertformat_attr_add(&format, "msk", GPU_COMP_F32, 1, GPU_FETCH_FLOAT);
       g_vbo_id.col = GPU_vertformat_attr_add(
-          &format, "c", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT);
+          &format, "ac", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT);
     }
     buffers->vert_buf = GPU_vertbuf_create_with_format_ex(&format, GPU_USAGE_STATIC);
   }
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 6e387799060..41e71f8128c 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -378,12 +378,9 @@ void gpu_extensions_init(void)
       GG.dfdyfactors[1] = 1.0;
     }
 
-    if (strstr(version, "Build 10.18.10.3574") ||
-        strstr(version, "Build 10.18.10.4252") ||
-        strstr(version, "Build 10.18.10.4358") ||
-        strstr(version, "Build 10.18.10.5069") ||
-        strstr(version, "Build 10.18.14.4264") ||
-        strstr(version, "Build 10.18.14.4432") ||
+    if (strstr(version, "Build 10.18.10.3574") || strstr(version, "Build 10.18.10.4252") ||
+        strstr(version, "Build 10.18.10.4358") || strstr(version, "Build 10.18.10.5069") ||
+        strstr(version, "Build 10.18.14.4264") || strstr(version, "Build 10.18.14.4432") ||
         strstr(version, "Build 10.18.14.5067")) {
       GG.context_local_shaders_workaround = true;
     }