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:
authorCampbell Barton <ideasman42@gmail.com>2018-04-22 09:44:23 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-22 09:45:52 +0300
commit02f28da187b744b3dea0d253b3d46d91b201a98d (patch)
treebc91af2ee1f6304e7ee8402e8063874f2737f11d /source/blender/gpu
parentba711847554f6125ba75c7faf3bd876164f1edce (diff)
Cleanup: trailing spaces
Applied to newly added files in 2.8
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/GPU_batch.h4
-rw-r--r--source/blender/gpu/GPU_immediate.h4
-rw-r--r--source/blender/gpu/intern/gpu_uniformbuffer.c2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_edges_front_back_persp_geom.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_image_linear_frag.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_edges_variying_color_geom.glsl2
12 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h
index 760faeff7b1..b706bdbf189 100644
--- a/source/blender/gpu/GPU_batch.h
+++ b/source/blender/gpu/GPU_batch.h
@@ -4,7 +4,7 @@
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,7 @@
* The Original Code is Copyright (C) 2016 Blender Foundation.
* All rights reserved.
*
- *
+ *
* Contributor(s): Mike Erwin
*
* ***** END GPL LICENSE BLOCK *****
diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h
index 6206e973908..2a2692e6baf 100644
--- a/source/blender/gpu/GPU_immediate.h
+++ b/source/blender/gpu/GPU_immediate.h
@@ -4,7 +4,7 @@
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,7 @@
* The Original Code is Copyright (C) 2016 Blender Foundation.
* All rights reserved.
*
- *
+ *
* Contributor(s): Mike Erwin
*
* ***** END GPL LICENSE BLOCK *****
diff --git a/source/blender/gpu/intern/gpu_uniformbuffer.c b/source/blender/gpu/intern/gpu_uniformbuffer.c
index 6d52dab5a1f..afd43600d9b 100644
--- a/source/blender/gpu/intern/gpu_uniformbuffer.c
+++ b/source/blender/gpu/intern/gpu_uniformbuffer.c
@@ -101,7 +101,7 @@ GPUUniformBuffer *GPU_uniformbuffer_create(int size, const void *data, char err_
/* Generate Buffer object */
glGenBuffers(1, &ubo->bindcode);
-
+
if (!ubo->bindcode) {
if (err_out)
BLI_snprintf(err_out, 256, "GPUUniformBuffer: UBO create failed");
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl
index 8dda575107a..1497f9eeeb1 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl
@@ -7,4 +7,4 @@ out vec4 fragColor;
void main() {
fragColor = finalColor;
fragColor.a *= smoothstep(1.0, 0.1, abs(colorGradient));
-} \ No newline at end of file
+}
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl
index 4c295fcd72a..4a9f5f94321 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl
@@ -104,4 +104,4 @@ void main(void)
if (expand.y != 1.0 && !doArrow) {
gl_Position.xy *= 0.0;
}
-} \ No newline at end of file
+}
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl
index f660cae8d12..286a5373554 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl
@@ -32,4 +32,4 @@ void main()
if (butCo > 0.0) {
fragColor.a = 1.0;
}
-} \ No newline at end of file
+}
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl
index 7587b2fc18a..fc4d055a903 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl
@@ -10,4 +10,4 @@ void main()
fragColor = vec4(0.0);
/* Manual curve fit of the falloff curve of previous drawing method. */
fragColor.a = alpha * (shadowFalloff * shadowFalloff * 0.722 + shadowFalloff * 0.277);
-} \ No newline at end of file
+}
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl
index 2f5353a7c86..f6be496ac4f 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl
@@ -61,4 +61,4 @@ void main()
v += rct.xw;
gl_Position = ModelViewProjectionMatrix * vec4(v, 0.0, 1.0);
-} \ No newline at end of file
+}
diff --git a/source/blender/gpu/shaders/gpu_shader_edges_front_back_persp_geom.glsl b/source/blender/gpu/shaders/gpu_shader_edges_front_back_persp_geom.glsl
index 10b5fad7972..e7632fcad15 100644
--- a/source/blender/gpu/shaders/gpu_shader_edges_front_back_persp_geom.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_edges_front_back_persp_geom.glsl
@@ -45,7 +45,7 @@ void main()
if (finalEdgeClass > 0.0f) {
// front-facing edge
if (drawFront)
- emitLine(frontColor);
+ emitLine(frontColor);
}
else if (finalEdgeClass < 0.0f) {
// back-facing edge
diff --git a/source/blender/gpu/shaders/gpu_shader_image_linear_frag.glsl b/source/blender/gpu/shaders/gpu_shader_image_linear_frag.glsl
index c2b25cc8011..97eb3afc177 100644
--- a/source/blender/gpu/shaders/gpu_shader_image_linear_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_image_linear_frag.glsl
@@ -27,4 +27,4 @@ void main() {
fragColor = texture(image, texCoord_interp.st);
linearrgb_to_srgb(fragColor, fragColor);
-} \ No newline at end of file
+}
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 142df70e68a..ced5bb7f684 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
@@ -22,4 +22,4 @@ void main()
gl_Position = ViewProjectionMatrix * InstanceModelMatrix * vec4(pos * -len + sta, 1.0);
gl_PointSize = size;
finalColor = vec4(color, 1.0);
-} \ No newline at end of file
+}
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_edges_variying_color_geom.glsl b/source/blender/gpu/shaders/gpu_shader_instance_edges_variying_color_geom.glsl
index 6f580ef3ff6..e26f419b8cd 100644
--- a/source/blender/gpu/shaders/gpu_shader_instance_edges_variying_color_geom.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_instance_edges_variying_color_geom.glsl
@@ -42,7 +42,7 @@ void main()
if (finalEdgeClass > 0.0f) {
// front-facing edge
if (drawFront)
- emitLine(vec4(fCol[0], 0.75));
+ emitLine(vec4(fCol[0], 0.75));
}
else if (finalEdgeClass < 0.0f) {
// back-facing edge