Cleanup: trailing space

This commit is contained in:
Campbell Barton 2018-10-21 16:08:30 +11:00
parent 34f2ed7f71
commit 769b979abb
7 changed files with 11 additions and 12 deletions

View File

@ -364,4 +364,3 @@ void DRW_gpencil_freecache(struct Object *ob)
}
}
}

View File

@ -42,11 +42,11 @@ void main()
/* round to avoid shift when add more samples */
dx = floor(dx) + 1.0;
dy = floor(dy) + 1.0;
/* apply blurring, using a 9-tap filter with predefined gaussian weights */
/* depth (get the value of the surrounding pixels) */
float outdepth = 0.0;
outdepth += get_zdepth(ivec2(uv.x - 1.0 * dx, uv.y + 1.0 * dy)) * 0.0947416;
outdepth += get_zdepth(ivec2(uv.x - 0.0 * dx, uv.y + 1.0 * dy)) * 0.118318;
outdepth += get_zdepth(ivec2(uv.x + 1.0 * dx, uv.y + 1.0 * dy)) * 0.0947416;
@ -76,7 +76,7 @@ void main()
outcolor += texelFetch(strokeColor, ivec2(uv.x + 1.0 * dx, uv.y - 1.0 * dy), 0) * 0.0947416;
FragColor = clamp(outcolor, 0, 1.0);
/* discar extreme values */
if (outcolor.a < 0.02f) {
discard;

View File

@ -28,7 +28,7 @@ bool check_color(vec3 color_a, vec3 color_b)
/* need round the number to avoid precision errors */
if ((floor(color_a.r * 100) == floor(color_b.r * 100)) &&
(floor(color_a.g * 100) == floor(color_b.g * 100)) &&
(floor(color_a.b * 100) == floor(color_b.b * 100)))
(floor(color_a.b * 100) == floor(color_b.b * 100)))
{
return true;
}
@ -62,7 +62,7 @@ void main()
else {
discard;
}
gl_FragDepth = stroke_depth;
FragColor = vec4(glow_color.rgb, 1.0);
}

View File

@ -30,17 +30,17 @@ void main()
outcolor = src_pixel;
}
}
if (src_pixel.a < glow_pixel.a) {
gl_FragDepth = glow_depth;
}
else {
gl_FragDepth = stroke_depth;
}
if (outcolor.a < 0.001) {
discard;
}
FragColor = outcolor;
}

View File

@ -38,6 +38,6 @@ void main()
FragColor = outcolor;
gl_FragDepth = stroke_depth;
if (outcolor.a < 0.02f)
if (outcolor.a < 0.02f)
discard;
}

View File

@ -100,4 +100,4 @@ void main()
# endif
}
#endif
#endif

View File

@ -1025,7 +1025,7 @@ void RNA_api_ui_layout(StructRNA *srna)
RNA_def_enum(func, "type", rna_enum_uilist_layout_type_items, UILST_LAYOUT_DEFAULT, "Type", "Type of layout to use");
RNA_def_int(func, "columns", 9, 0, INT_MAX, "", "Number of items to display per row, for GRID layout", 0, INT_MAX);
RNA_def_boolean(func, "reverse", false, "", "Display items in reverse order");
func = RNA_def_function(srna, "template_running_jobs", "uiTemplateRunningJobs");
RNA_def_function_flag(func, FUNC_USE_CONTEXT);