[Bf-blender-cvs] [dbcdc536b6a] temp-gpu-uniform-builtin-structs: Fix crash: incorrect uniform location for builtins.

[Jeroen Bakker]

Commit: dbcdc536b6a20c7218c3b6f4871d8c29e5127366
Author: Jeroen Bakker
Date:   Fri Jul 9 09:00:13 2021 +0200
Branches: temp-gpu-uniform-builtin-structs
https://developer.blender.org/rBdbcdc536b6a20c7218c3b6f4871d8c29e5127366

Fix crash: incorrect uniform location for builtins.

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/gpu/opengl/gl_shader_interface.cc
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 4833954c0ac..1ab25ca4f20 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 4833954c0ac85cc407e1d5a153aa11b1d1823ec0
+Subproject commit 1ab25ca4f208edc8fb6c3551b3050ce3ad50ad7c
diff --git a/release/scripts/addons b/release/scripts/addons
index f86f25e6221..7884a7bbf9e 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f86f25e62217264495d05f116ccb09d575fe9841
+Subproject commit 7884a7bbf9e2c9358609129ad8f4fca351d7f278
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 5a82baad9f9..fd1bed98c9e 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 5a82baad9f986722104280e8354a4427d8e9eab1
+Subproject commit fd1bed98c9e0a733451168eecc828cce460205d4
diff --git a/source/blender/gpu/opengl/gl_shader_interface.cc b/source/blender/gpu/opengl/gl_shader_interface.cc
index d9291cd642a..c5c8e2397d1 100644
--- a/source/blender/gpu/opengl/gl_shader_interface.cc
+++ b/source/blender/gpu/opengl/gl_shader_interface.cc
@@ -334,7 +334,7 @@ GLShaderInterface::GLShaderInterface(const UniformBuiltinStructType *type_info,
   for (int32_t u_int = 0; u_int < GPU_NUM_UNIFORMS; u_int++) {
     GPUUniformBuiltin u = static_cast<GPUUniformBuiltin>(u_int);
     const ShaderInput *block = this->uniform_get(builtin_uniform_name(u));
-    builtins_[u] = (block != nullptr) ? block->binding : -1;
+    builtins_[u] = (block != nullptr) ? block->location : -1;
   }
 
   /* Builtin Uniforms Blocks */
diff --git a/source/tools b/source/tools
index 01f51a0e551..c8579c5cf43 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 01f51a0e551ab730f0934dc6488613690ac4bf8f
+Subproject commit c8579c5cf43229843df505da9644b5b0b7201974