[Bf-blender-cvs] [393050e8e59] master: Merge remote-tracking branch 'origin/blender-v2.83-release'

[Ray Molenkamp]

Commit: 393050e8e597b145539a591f31e9ef3bfd09733e
Author: Ray Molenkamp
Date:   Mon May 18 16:37:57 2020 -0600
Branches: master
https://developer.blender.org/rB393050e8e597b145539a591f31e9ef3bfd09733e

Merge remote-tracking branch 'origin/blender-v2.83-release'

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



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

diff --cc build_files/cmake/platform/platform_win32.cmake
index 1889c9773fb,77652511416..088897f7b42
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@@ -190,7 -166,7 +190,7 @@@ if(MSVC_VERSION GREATER 1914 AND NOT MS
    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /JMC")
  endif()
  
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /SUBSYSTEM:CONSOLE /STACK:2097152 ")
 -set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /SUBSYSTEM:CONSOLE /STACK:2097152,70656 /INCREMENTAL:NO ")
++set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /SUBSYSTEM:CONSOLE /STACK:2097152,70656 ")
  set(PLATFORM_LINKFLAGS_RELEASE "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib")
  set(PLATFORM_LINKFLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG} /IGNORE:4099 /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:libcmtd.lib")
  
diff --cc source/blender/gpu/intern/gpu_shader_interface.c
index 1caa88d18ae,8cd1afad536..3218d12bc0d
--- a/source/blender/gpu/intern/gpu_shader_interface.c
+++ b/source/blender/gpu/intern/gpu_shader_interface.c
@@@ -254,14 -254,12 +254,16 @@@ GPUShaderInterface *GPU_shaderinterface
      }
  
      /* TODO: reject DOUBLE gl_types */
 -
      input->location = glGetAttribLocation(program, name);
 +    /* Ignore OpenGL names like `gl_BaseInstanceARB`, `gl_InstanceID` and `gl_VertexID`. */
 +    if (input->location == -1) {
 +      MEM_freeN(input);
 +      continue;
 +    }
  
-     shaderface->enabled_attr_mask |= (1 << input->location);
+     if (input->location != -1) {
+       shaderface->enabled_attr_mask |= (1 << input->location);
+     }
  
      set_input_name(shaderface, input, name, name_len);