[Bf-blender-cvs] [5b6df588f2c] temp-udim-images: Cleanup whitespace

Lukas Stockner noreply at git.blender.org
Thu Jun 28 00:21:42 CEST 2018


Commit: 5b6df588f2cee563673345ddaf082e12415c8243
Author: Lukas Stockner
Date:   Thu Jun 28 02:19:32 2018 +0200
Branches: temp-udim-images
https://developer.blender.org/rB5b6df588f2cee563673345ddaf082e12415c8243

Cleanup whitespace

===================================================================

M	source/blender/blenkernel/intern/image.c
M	source/blender/blenloader/intern/versioning_280.c
M	source/blender/editors/sculpt_paint/paint_image_2d.c
M	source/blender/gpu/intern/gpu_draw.c
M	source/blender/gpu/intern/gpu_texture.c
M	source/blender/gpu/shaders/gpu_shader_material.glsl
M	source/blender/nodes/shader/nodes/node_shader_tex_image.c

===================================================================

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index d7aed7c8121..1fb7d46bacb 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -170,7 +170,7 @@ static void imagecache_remove(Image *image, int index)
 {
 	if (!image->cache)
 		return;
-	
+
 	ImageCacheKey key;
 	key.index = index;
 	IMB_moviecache_remove(image->cache, &key);
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 14686800d15..d47ef0c872d 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1554,5 +1554,4 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 			}
 		}
 	}
-	
 }
diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c
index 6aa30111380..99134687cbc 100644
--- a/source/blender/editors/sculpt_paint/paint_image_2d.c
+++ b/source/blender/editors/sculpt_paint/paint_image_2d.c
@@ -1374,7 +1374,7 @@ void paint_2d_stroke(void *ps, const float prev_mval[2], const float mval[2], co
 			continue;
 
 		ImBuf *ibuf = BKE_image_acquire_ibuf(s->image, &tile->iuser, NULL);
-		
+
 		/* OCIO_TODO: float buffers are now always linear, so always use color correction
 		*            this should probably be changed when texture painting color space is supported
 		*/
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index 5463ac987a8..812269d032d 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -283,7 +283,7 @@ GPUTexture *GPU_texture_from_blender(Image *ima,
 	if (ima == NULL) {
 		return NULL;
 	}
-	
+
 	int gputex_type = (textarget == GL_TEXTURE_CUBE_MAP)? TEXTARGET_TEXTURE_CUBE_MAP : TEXTARGET_TEXTURE_2D;
 	ImageTile *tile = BKE_image_get_tile_from_iuser(ima, iuser);
 
diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c
index 6c7ca680aaa..ae037ca442e 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -36,7 +36,6 @@
 #include "BLI_threads.h"
 
 #include "BKE_global.h"
-#include "BKE_image.h"
 
 #include "GPU_batch.h"
 #include "GPU_debug.h"
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 9cdf27edac5..d6d51d24129 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -1777,7 +1777,7 @@ void node_tex_image_tile(vec3 map, float tile_id, sampler2D ima, vec4 in_color,
 		color = texture(ima, map.xy);
 	else
 		color = in_color;
-	
+
 	alpha = color.a;
 }
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.c b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
index 154f236472d..3fd1a5d61fd 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_image.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
@@ -79,7 +79,7 @@ static int node_shader_gpu_tex_image(GPUMaterial *mat, bNode *node, bNodeExecDat
 		LISTBASE_FOREACH(ImageTile *, tile, &ima->tiles) {
 			float tile_number = tile->tile_number;
 			GPU_link(mat, "node_tex_image_tile", map, GPU_uniform(&tile_number), GPU_image(ima, iuser, isdata, tile->tile_number),
-			         out[0].link, &out[0].link, &out[1].link);
+			                                     out[0].link, &out[0].link, &out[1].link);
 		}
 	}
 	else {
@@ -89,17 +89,17 @@ static int node_shader_gpu_tex_image(GPUMaterial *mat, bNode *node, bNodeExecDat
 				break;
 			case SHD_PROJ_BOX:
 				GPU_link(mat, "direction_transform_m4v3", GPU_builtin(GPU_VIEW_NORMAL),
-														GPU_builtin(GPU_INVERSE_VIEW_MATRIX),
-														&norm);
+				                                          GPU_builtin(GPU_INVERSE_VIEW_MATRIX),
+				                                          &norm);
 				GPU_link(mat, "direction_transform_m4v3", norm,
-														GPU_builtin(GPU_INVERSE_OBJECT_MATRIX),
-														&norm);
+				                                          GPU_builtin(GPU_INVERSE_OBJECT_MATRIX),
+				                                          &norm);
 				GPU_link(mat, "node_tex_image_box", in[0].link,
-													norm,
-													GPU_image(ima, iuser, isdata, 0),
-													GPU_uniform(&blend),
-													&out[0].link,
-													&out[1].link);
+				                                    norm,
+				                                    GPU_image(ima, iuser, isdata, 0),
+				                                    GPU_uniform(&blend),
+				                                    &out[0].link,
+				                                    &out[1].link);
 				break;
 			case SHD_PROJ_SPHERE:
 				GPU_link(mat, "point_texco_remap_square", in[0].link, &in[0].link);



More information about the Bf-blender-cvs mailing list