diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
| commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
| tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/gpu/shaders | |
| parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
| parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/shaders')
4 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl b/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl index 5f7455582cd..c4657bb7f66 100644 --- a/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl @@ -263,4 +263,3 @@ void main() #endif } - diff --git a/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl b/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl index bc940222f85..4fdaf809cd1 100644 --- a/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl @@ -73,4 +73,3 @@ void main() varying_texture_coord = (gl_TextureMatrix[0] * gl_MultiTexCoord0).st; #endif } - diff --git a/source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl b/source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl index 0fcab6302e4..b4576f75d19 100644 --- a/source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl @@ -72,4 +72,3 @@ void main() vert_generic(); #endif } - diff --git a/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl b/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl index af2e4ba19a2..6f97ef8abef 100644 --- a/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl +++ b/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl @@ -73,4 +73,3 @@ void main() varposition = gl_Vertex.xyz; varnormal = normalize(-varposition); - |