From 20c5f677d73cd6efc2b28d18c09c70b2f5b3c9c4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 26 Apr 2019 13:03:38 +1000 Subject: Cleanup: clang-format --- extern/draco/dracoenc/cmake/util.cmake | 1 - source/blender/blenkernel/intern/dynamicpaint.c | 4 ++-- source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl | 2 +- source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl | 2 +- source/blender/draw/intern/draw_cache_impl_mesh.c | 3 +-- source/blender/draw/intern/draw_cache_impl_metaball.c | 2 +- source/blender/draw/modes/edit_mesh_mode.c | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/extern/draco/dracoenc/cmake/util.cmake b/extern/draco/dracoenc/cmake/util.cmake index 252761fe6fb..d9254c03c03 100644 --- a/extern/draco/dracoenc/cmake/util.cmake +++ b/extern/draco/dracoenc/cmake/util.cmake @@ -71,4 +71,3 @@ macro (set_variable_if_unset var_name default_value) endmacro () endif() # DRACO_CMAKE_UTIL_CMAKE_ - diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 38ecc95da22..47043064b90 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -1027,8 +1027,8 @@ DynamicPaintSurface *dynamicPaint_createNewSurface(DynamicPaintCanvasSettings *c /* Set initial values */ surface->flags = MOD_DPAINT_ANTIALIAS | MOD_DPAINT_MULALPHA | MOD_DPAINT_DRY_LOG | - MOD_DPAINT_DISSOLVE_LOG | MOD_DPAINT_ACTIVE | - MOD_DPAINT_OUT1 | MOD_DPAINT_USE_DRYING; + MOD_DPAINT_DISSOLVE_LOG | MOD_DPAINT_ACTIVE | MOD_DPAINT_OUT1 | + MOD_DPAINT_USE_DRYING; surface->effect = 0; surface->effect_ui = 1; diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl index 7054717b8d6..cc47e12b303 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl @@ -62,7 +62,7 @@ void main() box = check_box_point(centered, vec2(gradient_s / 2.0)); if ((box.x > 1.0) || (box.y > 1.0)) { discard; - } + } } vec4 tmp_color = texture2D(myTexture, mTexCoord); diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl index 3110f975cc6..6b7cee888ea 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl @@ -79,7 +79,7 @@ void main() float d = abs(mTexCoord.y - 0.5) * (1.1 - gradient_f); float alpha = 1.0 - clamp((fragColor.a - (d * 2.0)), 0.03, 1.0); fragColor.a = smoothstep(fragColor.a, 0.0, alpha); - + } */ diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index b2e960f461f..e52868f613e 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -3386,8 +3386,7 @@ static void mesh_create_edit_facedots(MeshRenderData *rdata, GPUVertBuf *vbo_fac } } -static void mesh_create_edit_mesh_analysis(MeshRenderData *rdata, - GPUVertBuf *vbo_mesh_analysis) +static void mesh_create_edit_mesh_analysis(MeshRenderData *rdata, GPUVertBuf *vbo_mesh_analysis) { const MeshStatVis *mesh_stat_vis = &rdata->toolsettings->statvis; diff --git a/source/blender/draw/intern/draw_cache_impl_metaball.c b/source/blender/draw/intern/draw_cache_impl_metaball.c index 2c06d536f3d..432c5092274 100644 --- a/source/blender/draw/intern/draw_cache_impl_metaball.c +++ b/source/blender/draw/intern/draw_cache_impl_metaball.c @@ -265,4 +265,4 @@ struct GPUBatch *DRW_metaball_batch_cache_get_edge_detection(struct Object *ob, } return cache->edge_detection; -} \ No newline at end of file +} diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index a83926f6568..6f7b30efd93 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -696,7 +696,7 @@ static void EDIT_MESH_cache_populate(void *vedata, Object *ob) if (do_show_mesh_analysis) { Mesh *me = (Mesh *)ob->data; BMEditMesh *embm = me->edit_mesh; - const bool is_original = embm->mesh_eval_final && \ + const bool is_original = embm->mesh_eval_final && (embm->mesh_eval_final->runtime.is_original == true); if (is_original) { geom = DRW_cache_mesh_surface_mesh_analysis_get(ob); -- cgit v1.2.3