diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2020-08-10 10:09:49 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-08-10 10:09:49 +0300 |
| commit | e2d5e8d58411faca19043e51e55ff2e11b26acde (patch) | |
| tree | 8140e9758dc5f31b4591136ec8f91ad08a8dc22d /source/blender/draw | |
| parent | 4fd73e74655321c600f3bce1a9eed24f7a87ce1a (diff) | |
| parent | 6640ed92c09c83bfe01cab539f212957b5ca2e16 (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/intern/shaders/common_view_lib.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/intern/shaders/common_view_lib.glsl b/source/blender/draw/intern/shaders/common_view_lib.glsl index a55d2cd8c1a..73c112fe3fb 100644 --- a/source/blender/draw/intern/shaders/common_view_lib.glsl +++ b/source/blender/draw/intern/shaders/common_view_lib.glsl @@ -85,7 +85,7 @@ vec4 pack_line_data(vec2 frag_co, vec2 edge_start, vec2 edge_pos) uniform int resourceChunk; #ifdef GPU_VERTEX_SHADER -# ifdef GL_ARB_shader_draw_parameters +# ifdef GPU_ARB_shader_draw_parameters # define baseInstance gl_BaseInstanceARB # else /* no ARB_shader_draw_parameters */ uniform int baseInstance; |