From 54f89e870425b20af14e2be03b777836b88a29af Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 4 Jan 2021 12:00:18 +1100 Subject: Cleanup: docy comments beginning with '/**' don't end with '**/' --- source/blender/draw/engines/gpencil/gpencil_draw_data.c | 4 ++-- source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/draw/engines/gpencil') diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_data.c b/source/blender/draw/engines/gpencil/gpencil_draw_data.c index 18ca2e4ccc9..28c322b5e08 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_data.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_data.c @@ -175,7 +175,7 @@ static MaterialGPencilStyle *gpencil_viewport_material_overrides(GPENCIL_Private * Creates a linked list of material pool containing all materials assigned for a given object. * We merge the material pools together if object does not contain a huge amount of materials. * Also return an offset to the first material of the object in the ubo. - **/ + */ GPENCIL_MaterialPool *gpencil_material_pool_create(GPENCIL_PrivateData *pd, Object *ob, int *ofs) { GPENCIL_MaterialPool *matpool = pd->last_material_pool; @@ -424,7 +424,7 @@ void gpencil_light_pool_populate(GPENCIL_LightPool *lightpool, Object *ob) /** * Creates a single pool containing all lights assigned (light linked) for a given object. - **/ + */ GPENCIL_LightPool *gpencil_light_pool_create(GPENCIL_PrivateData *pd, Object *UNUSED(ob)) { GPENCIL_LightPool *lightpool = pd->last_light_pool; diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl index 45b2b92a09b..189ed91cbb4 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl @@ -128,7 +128,7 @@ void blend_mode_output( * rtn = 1 - 2 (1 - dst * (1 - src) - src); * rtn = 1 - 2 + dst * (2 - 2 * src) + 2 * src; * rtn = (- 1 + 2 * src) + dst * (2 - 2 * src); - **/ + */ color = mix(vec4(0.5), color, color.a * opacity); vec4 s = step(-0.5, -color); frag_revealage = frag_color = 2.0 * s + 2.0 * color * (1.0 - s * 2.0); @@ -363,7 +363,7 @@ void color_output(vec4 stroke_col, vec4 vert_col, float vert_strength, float mix * finalColorAdd is how much of the mixed color to add. * Note that we never add alpha. This is to keep the texture act as a stencil. * We do however, modulate the alpha (reduce it). - **/ + */ /* We add the mixed color. This is 100% mix (no texture visible). */ finalColorMul = vec4(mixed_col.aaa, mixed_col.a); finalColorAdd = vec4(mixed_col.rgb * mixed_col.a, 0.0); -- cgit v1.2.3