Merge branch 'master' into 28
[blender.git] / source / blender / gpu / intern / gpu_basic_shader.c
index bbd28c8803d3bc19b502f724cb8579cdca3be4ba..ff385683a1e6ae0e57918f74c6d8dbd9138a9ce5 100644 (file)
@@ -281,7 +281,7 @@ static GPUShader *gpu_basic_shader(int options)
        return shader;
 }
 
        return shader;
 }
 
-static void GPU_basic_shader_uniform_autoset(GPUShader *shader, int options)
+static void gpu_basic_shader_uniform_autoset(GPUShader *shader, int options)
 {
        if (options & GPU_SHADER_LINE) {
                glGetIntegerv(GL_VIEWPORT, &GPU_MATERIAL_STATE.viewport[0]);
 {
        if (options & GPU_SHADER_LINE) {
                glGetIntegerv(GL_VIEWPORT, &GPU_MATERIAL_STATE.viewport[0]);
@@ -299,7 +299,7 @@ void GPU_basic_shader_bind(int options)
 
                if (shader) {
                        GPU_shader_bind(shader);
 
                if (shader) {
                        GPU_shader_bind(shader);
-                       GPU_basic_shader_uniform_autoset(shader, options);
+                       gpu_basic_shader_uniform_autoset(shader, options);
                }
        }
        else {
                }
        }
        else {