From e7c9ea3b27cfd15cf6cbef0a1bc1b61797936893 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 5 Apr 2025 08:49:20 +0000 Subject: [PATCH] Cleanup: correct typo in variable name & comments --- intern/ghost/GHOST_Types.h | 2 +- source/blender/blendthumb/CMakeLists.txt | 6 +++--- source/blender/editors/screen/screen_ops.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index 94dbe0eef78..62606014595 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -806,7 +806,7 @@ typedef struct { struct { /** * Handle of the exported GPU memory. Depending on the data_transfer_mode the actual handle - * type can be different (voidptr/int/..). + * type can be different (void-pointer/int/..). */ uint64_t image_handle; diff --git a/source/blender/blendthumb/CMakeLists.txt b/source/blender/blendthumb/CMakeLists.txt index 90b1be8674b..8888f9bb79f 100644 --- a/source/blender/blendthumb/CMakeLists.txt +++ b/source/blender/blendthumb/CMakeLists.txt @@ -38,9 +38,9 @@ if(WIN32) add_library(BlendThumb SHARED ${SRC} ${SRC_WIN32}) target_link_libraries(BlendThumb bf_blenlib dbghelp.lib Version.lib Comctl32.lib) - # Blenlib drags in a whole bunch of dependencies on shared libs, none of which are used by - # blenthumb, but will cause load issues since the debug linker will not eleminate them. - # Link with /OPT:ref to force elmination of those unused dependencies this is already + # `blenlib` drags in a whole bunch of dependencies on shared libraries, none of which are used + # by `blenthumb`, but will cause load issues since the debug linker will not eliminate them. + # Link with /OPT:ref to force elimination of those unused dependencies this is already # enabled by default on the release mode flags. set_target_properties(BlendThumb PROPERTIES LINK_FLAGS "/OPT:ref") set_target_properties(BlendThumb PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt") diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index bfa6aa73ad8..0d04b522540 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -841,7 +841,7 @@ static void area_actionzone_get_rect(AZone *az, rcti *r_rect) const bool is_right = is_vertical && bool(az->region->v2d.scroll & V2D_SCROLL_RIGHT); const bool is_left = is_vertical && bool(az->region->v2d.scroll & V2D_SCROLL_LEFT); const bool is_top = is_horizontal && bool(az->region->v2d.scroll & V2D_SCROLL_TOP); - const bool is_botton = is_horizontal && bool(az->region->v2d.scroll & V2D_SCROLL_BOTTOM); + const bool is_bottom = is_horizontal && bool(az->region->v2d.scroll & V2D_SCROLL_BOTTOM); /* For scroll azones use the area around the region's scroll-bar location. */ rcti scroller_vert = is_horizontal ? az->region->v2d.hor : az->region->v2d.vert; BLI_rcti_translate(&scroller_vert, az->region->winrct.xmin, az->region->winrct.ymin); @@ -851,7 +851,7 @@ static void area_actionzone_get_rect(AZone *az, rcti *r_rect) r_rect->xmin = scroller_vert.xmin - (is_right ? V2D_SCROLL_HIDE_HEIGHT : edge_padding); r_rect->ymin = scroller_vert.ymin - (is_top ? V2D_SCROLL_HIDE_WIDTH : edge_padding); r_rect->xmax = scroller_vert.xmax + (is_left ? V2D_SCROLL_HIDE_HEIGHT : edge_padding); - r_rect->ymax = scroller_vert.ymax + (is_botton ? V2D_SCROLL_HIDE_WIDTH : edge_padding); + r_rect->ymax = scroller_vert.ymax + (is_bottom ? V2D_SCROLL_HIDE_WIDTH : edge_padding); } else { azone_clipped_rect_calc(az, r_rect);