diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-03-18 01:35:12 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-03-18 01:36:44 +0300 |
commit | bb6765f28fdde392976c38712c851d0ef8c75a2c (patch) | |
tree | 500342ef54f60bb73b429e74355139665bff500f /source/blender/draw | |
parent | 0c58ad8a34c55344262ac74fce87888beb464155 (diff) |
Cleanup: spelling
Diffstat (limited to 'source/blender/draw')
6 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_image.c b/source/blender/draw/engines/overlay/overlay_image.c index 844a0eb8351..ada07499d1c 100644 --- a/source/blender/draw/engines/overlay/overlay_image.c +++ b/source/blender/draw/engines/overlay/overlay_image.c @@ -164,7 +164,7 @@ static struct GPUTexture *image_camera_background_texture_get(CameraBGImage *bgp BKE_image_user_frame_calc(image, iuser, ctime); if (image->source == IMA_SRC_SEQUENCE && !(iuser->flag & IMA_USER_FRAME_IN_RANGE)) { - /* Frame is out of range, dont show. */ + /* Frame is out of range, don't show. */ return NULL; } diff --git a/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl b/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl index f24aee56bb2..c204949cc45 100644 --- a/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl @@ -134,7 +134,8 @@ void main() fragColor *= line_coverage(dist, line_kernel); } - /* We dont order fragments but use alpha over/alpha under based on current minimum frag depth. */ + /* We don't order fragments but use alpha over/alpha under based on current minimum frag depth. + */ neighbor_blend(coverage.x, depths.x, neightbor_col0, depth, fragColor); neighbor_blend(coverage.y, depths.y, neightbor_col1, depth, fragColor); neighbor_blend(coverage.z, depths.z, neightbor_col2, depth, fragColor); diff --git a/source/blender/draw/engines/overlay/shaders/armature_stick_vert.glsl b/source/blender/draw/engines/overlay/shaders/armature_stick_vert.glsl index 99bdbfea2be..0a2598fb6b7 100644 --- a/source/blender/draw/engines/overlay/shaders/armature_stick_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/armature_stick_vert.glsl @@ -15,10 +15,10 @@ in uint flag; /* ---- Per instance Attrs ---- */ in vec3 boneStart; in vec3 boneEnd; -in vec4 wireColor; /* alpha encode if we do wire. If 0.0 we dont. */ -in vec4 boneColor; /* alpha encode if we do bone. If 0.0 we dont. */ -in vec4 headColor; /* alpha encode if we do head. If 0.0 we dont. */ -in vec4 tailColor; /* alpha encode if we do tail. If 0.0 we dont. */ +in vec4 wireColor; /* alpha encode if we do wire. If 0.0 we don't. */ +in vec4 boneColor; /* alpha encode if we do bone. If 0.0 we don't. */ +in vec4 headColor; /* alpha encode if we do head. If 0.0 we don't. */ +in vec4 tailColor; /* alpha encode if we do tail. If 0.0 we don't. */ #define do_wire (wireColor.a > 0.0) #define is_head bool(flag & POS_HEAD) diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c index bd5b61b26e9..0d7f2e67598 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.c +++ b/source/blender/draw/engines/workbench/workbench_engine.c @@ -68,7 +68,7 @@ void workbench_engine_init(void *ved) wpd->object_id_tx = DRW_texture_pool_query_fullscreen(GPU_R16UI, &draw_engine_workbench); } else { - /* Dont free because it's a pool texture. */ + /* Don't free because it's a pool texture. */ wpd->object_id_tx = NULL; } diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 132b5274517..d3a90ccfbd0 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -279,7 +279,7 @@ DRWView *DRW_view_create_with_zoffset(const DRWView *parent_view, float viewdist = rv3d->dist; - /* special exception for ortho camera (viewdist isnt used for perspective cameras) */ + /* special exception for ortho camera (`viewdist` isn't used for perspective cameras). */ if (rv3d->persp == RV3D_CAMOB && rv3d->is_persp == false) { viewdist = 1.0f / max_ff(fabsf(winmat[0][0]), fabsf(winmat[1][1])); } diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 244b0133e64..2655319bbd4 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -3092,7 +3092,7 @@ void DRW_opengl_context_destroy(void) void DRW_opengl_context_enable_ex(bool UNUSED(restore)) { if (DST.gl_context != NULL) { - /* IMPORTANT: We dont support immediate mode in render mode! + /* IMPORTANT: We don't support immediate mode in render mode! * This shall remain in effect until immediate mode supports * multiple threads. */ BLI_ticket_mutex_lock(DST.gl_context_mutex); |