diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c index b254e771cc5..dec14b30e59 100644 --- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c @@ -364,4 +364,3 @@ void DRW_gpencil_freecache(struct Object *ob) } } } - diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_blur_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_blur_frag.glsl index 027048e3f5f..e59cbef3e5d 100644 --- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_blur_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_blur_frag.glsl @@ -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; diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_prepare_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_prepare_frag.glsl index 237cdf15627..9cdcad3e486 100644 --- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_prepare_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_prepare_frag.glsl @@ -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); } diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_resolve_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_resolve_frag.glsl index 010c4ef4a88..5bff7a20523 100644 --- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_resolve_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_resolve_frag.glsl @@ -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; } diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl index df5248c7791..3dbab0297c4 100644 --- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl @@ -38,6 +38,6 @@ void main() FragColor = outcolor; gl_FragDepth = stroke_depth; - if (outcolor.a < 0.02f) + if (outcolor.a < 0.02f) discard; } diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl index 8b1ffb5199d..d6bcffb12c6 100644 --- a/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl +++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl @@ -100,4 +100,4 @@ void main() # endif } -#endif \ No newline at end of file +#endif diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index 4adf10fedee..e40db8842af 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -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);