Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-24 19:46:51 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-24 19:48:29 +0300
commit342e73f90fc5c41af8db3a6e3dfdf1746f7f5bc4 (patch)
tree47fdb91d8e16b1c89f9ca358cb0172e862905ee1 /source/blender/gpu/shaders
parent9682e43bf9e078165b3d4d52c6a19c430ec2cbf2 (diff)
Spelling fixes in comments and descriptions (2.8 changes), patch by luzpaz.
Differential Revision: https://developer.blender.org/D3719
Diffstat (limited to 'source/blender/gpu/shaders')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_instance_vert.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_material.glsl2
9 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl
index aec8fd9b0a1..805ecd6085f 100644
--- a/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl
@@ -1,7 +1,7 @@
uniform mat4 ViewProjectionMatrix;
-/* ---- Instanciated Attribs ---- */
+/* ---- Instantiated Attribs ---- */
in float pos;
/* ---- Per instance Attribs ---- */
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl
index ced5bb7f684..255eeb9baf1 100644
--- a/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl
@@ -1,7 +1,7 @@
uniform mat4 ViewProjectionMatrix;
-/* ---- Instanciated Attribs ---- */
+/* ---- Instantiated Attribs ---- */
in vec3 pos;
/* ---- Per instance Attribs ---- */
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl
index 9876717b297..d2b64608eaa 100644
--- a/source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl
@@ -2,7 +2,7 @@
uniform mat4 ViewMatrix;
uniform mat4 ViewProjectionMatrix;
-/* ---- Instanciated Attribs ---- */
+/* ---- Instantiated Attribs ---- */
in vec3 pos;
in vec3 nor;
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl
index 2ee74b3eae0..429b648ca53 100644
--- a/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl
@@ -2,7 +2,7 @@
uniform mat4 ViewProjectionMatrix;
uniform vec3 screen_vecs[2];
-/* ---- Instanciated Attribs ---- */
+/* ---- Instantiated Attribs ---- */
in vec3 pos; /* using Z as axis id */
/* ---- Per instance Attribs ---- */
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl
index ba0ac29fb79..2a4675ce2c9 100644
--- a/source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl
@@ -4,7 +4,7 @@ uniform vec3 screen_vecs[2];
uniform float size;
uniform float pixel_size;
-/* ---- Instanciated Attribs ---- */
+/* ---- Instantiated Attribs ---- */
in vec2 pos;
/* ---- Per instance Attribs ---- */
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl
index 1c49d9dec3e..1ec158ae15c 100644
--- a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl
@@ -2,7 +2,7 @@
uniform mat4 ViewProjectionMatrix;
uniform float alpha;
-/* ---- Instanciated Attribs ---- */
+/* ---- Instantiated Attribs ---- */
in vec3 pos;
/* ---- Per instance Attribs ---- */
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl
index 49750dddb3c..f265bf9fc01 100644
--- a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl
@@ -2,7 +2,7 @@
uniform mat4 ViewProjectionMatrix;
uniform int baseId;
-/* ---- Instanciated Attribs ---- */
+/* ---- Instantiated Attribs ---- */
in vec3 pos;
/* ---- Per instance Attribs ---- */
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_vert.glsl
index eac167e8045..a4facae435e 100644
--- a/source/blender/gpu/shaders/gpu_shader_instance_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_instance_vert.glsl
@@ -1,7 +1,7 @@
uniform mat4 ViewProjectionMatrix;
-/* ---- Instanciated Attribs ---- */
+/* ---- Instantiated Attribs ---- */
in vec3 pos;
/* ---- Per instance Attribs ---- */
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 8fa1828bd9c..64f04e5b1fe 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -1375,7 +1375,7 @@ void node_subsurface_scattering(
eevee_closure_subsurface(N, color.rgb, 1.0, scale, out_diff, out_trans);
result.sss_data.rgb = out_diff + out_trans;
# ifdef USE_SSS_ALBEDO
- /* Not perfect for texture_blur not exaclty equal to 0.0 or 1.0. */
+ /* Not perfect for texture_blur not exactly equal to 0.0 or 1.0. */
result.sss_albedo.rgb = mix(color.rgb, vec3(1.0), texture_blur);
result.sss_data.rgb *= mix(vec3(1.0), color.rgb, texture_blur);
# else