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 18:41:46 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-24 18:42:52 +0300
commit253dce07d7cccb769d34356fc34c5900f7cd0ec8 (patch)
treee4018aaa2b89340d7d2e08cdbcba8ea3ff40b0cc /source/blender/gpu/intern/gpu_shader.c
parentfe52a05e950e474036c80f554a4675f12203695b (diff)
parent0cff044d84646c2890f13b8915eb708861bb36d6 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/intern/gpu_shader.c')
-rw-r--r--source/blender/gpu/intern/gpu_shader.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 9feaed80c2f..e0172579b3c 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -299,7 +299,7 @@ static void gpu_dump_shaders(const char **code, const int num_shaders, const cha
}
/* We use the same shader index for shaders in the same program.
- * So we call this function once before calling for the invidual shaders. */
+ * So we call this function once before calling for the individual shaders. */
static int shader_index = 0;
if (code == NULL) {
shader_index++;