[Bf-blender-cvs] [f36f0293210] blender2.8: Cleanup: style

Campbell Barton noreply at git.blender.org
Fri Oct 5 07:02:14 CEST 2018


Commit: f36f0293210128666f29f0be5c2dfb38bb3421e2
Author: Campbell Barton
Date:   Fri Oct 5 15:01:58 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBf36f0293210128666f29f0be5c2dfb38bb3421e2

Cleanup: style

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

M	release/scripts/startup/bl_app_templates_system/Sculpting/__init__.py
M	source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_prepare_frag.glsl
M	source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_resolve_frag.glsl
M	source/blender/draw/intern/draw_armature.c
M	source/blender/editors/gpencil/gpencil_select.c
M	source/blender/editors/mesh/editmesh_select_similar.c
M	source/blender/gpu/shaders/gpu_shader_2D_edituvs_facedots_vert.glsl
M	source/blender/gpu/shaders/gpu_shader_2D_edituvs_points_vert.glsl

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

diff --git a/release/scripts/startup/bl_app_templates_system/Sculpting/__init__.py b/release/scripts/startup/bl_app_templates_system/Sculpting/__init__.py
index 73fbfa7c7b0..77f879addae 100644
--- a/release/scripts/startup/bl_app_templates_system/Sculpting/__init__.py
+++ b/release/scripts/startup/bl_app_templates_system/Sculpting/__init__.py
@@ -21,4 +21,3 @@ def register():
 def unregister():
     import bpy
     bpy.app.handlers.load_post.remove(load_handler)
-
diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_prepare_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_prepare_frag.glsl
index d370f1fdcb5..8bb92f69723 100644
--- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_prepare_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_prepare_frag.glsl
@@ -65,18 +65,18 @@ void main()
 		vec2 rotpoint = vec2((tpos.x * cosv) - (tpos.y * sinv), (tpos.x * sinv) + (tpos.y * cosv));
 		tpos = rotpoint;
 	}
-	
+
 	/* apply offset */
 	tpos = vec2(tpos.x - dx, tpos.y - dy);
-	
+
 	/* apply scale */
 	tpos.x *= 1.0 / scale[0];
 	tpos.y *= 1.0 / scale[1];
-	
+
 	/* back to original coords system */
 	vec2 texpos = tpos + loc2d;
-	
-	/* wave */ 
+
+	/* wave */
 	if (orientation == HORIZONTAL) {
 		float pval = (uv.x * M_PI) / Viewport[0];
 		texpos.y += amplitude * sin((period * pval) + phase);
@@ -85,7 +85,7 @@ void main()
 		float pval = (uv.y * M_PI) / Viewport[1];
 		texpos.x += amplitude * sin((period * pval) + phase);
 	}
-	
+
 	vec4 src_pixel = texelFetch(strokeColor, ivec2(texpos.x, texpos.y), 0);
 	/* is transparent */
 	if (src_pixel.a == 0.0f) {
diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_resolve_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_resolve_frag.glsl
index 633dcf1fd63..0343d0d42fc 100644
--- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_resolve_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_resolve_frag.glsl
@@ -26,7 +26,7 @@ void main()
 		outcolor = shadow_pixel;
 		outdepth = shadow_depth;
 	}
-	
+
 	gl_FragDepth = outdepth;
 	FragColor = outcolor;
 }
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index e0ce5751956..a2394a6716c 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -1024,7 +1024,7 @@ static void ebone_spline_preview(EditBone *ebone, float result_array[MAX_BBONE_S
 	param.curveOutX = ebone->curveOutX;
 	param.curveOutY = ebone->curveOutY;
 
-	ebone->segments = BKE_compute_b_bone_spline(&param, (Mat4*)result_array);
+	ebone->segments = BKE_compute_b_bone_spline(&param, (Mat4 *)result_array);
 }
 
 static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pchan)
diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c
index 34bd49e9fcf..cb3c0575f81 100644
--- a/source/blender/editors/gpencil/gpencil_select.c
+++ b/source/blender/editors/gpencil/gpencil_select.c
@@ -833,7 +833,7 @@ static bool gp_stroke_do_circle_sel(
 	int x0 = 0, y0 = 0, x1 = 0, y1 = 0;
 	int i;
 	bool changed = false;
-	
+
 	if (gps->totpoints == 1) {
 		bGPDspoint pt_temp;
 		gp_point_to_parent_space(gps->points, diff_mat, &pt_temp);
@@ -1044,7 +1044,7 @@ static int gpencil_box_select_exec(bContext *C, wmOperator *op)
 
 	/* init space conversion stuff */
 	gp_point_conversion_init(C, &gsc);
-	
+
 	/* deselect all strokes first? */
 	if (select && !extend) {
 		CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c
index 35830a9aaa4..49675c2deb0 100644
--- a/source/blender/editors/mesh/editmesh_select_similar.c
+++ b/source/blender/editors/mesh/editmesh_select_similar.c
@@ -453,7 +453,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
 				}
 			}
 		}
-		
+
 		BMFace *face; /* Mesh face. */
 		BMIter iter; /* Selected faces iterator. */
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_edituvs_facedots_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_edituvs_facedots_vert.glsl
index 4f3f8917286..c5f84b976c5 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_edituvs_facedots_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_edituvs_facedots_vert.glsl
@@ -14,4 +14,4 @@ void main()
 {
 	gl_Position = ModelViewProjectionMatrix * vec4(pos, 0.0, 1.0);
 	finalColor = ((flag & FACE_SELECT) != 0) ? selectColor : vertColor;
-}
\ No newline at end of file
+}
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_edituvs_points_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_edituvs_points_vert.glsl
index d59e15a8f63..46dd1e066c8 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_edituvs_points_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_edituvs_points_vert.glsl
@@ -39,4 +39,4 @@ void main()
 
 	// convert to PointCoord units
 	radii /= pointSize;
-}
\ No newline at end of file
+}



More information about the Bf-blender-cvs mailing list