diff options
author | Campbell Barton <campbell@blender.org> | 2022-08-17 08:45:25 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-08-17 08:45:25 +0300 |
commit | e52fd904e879b64ea924b17cecc1fb345955145f (patch) | |
tree | 735393e2d0dfb433aa1a955784a9e45e5cef3d91 /source/blender/makesdna | |
parent | 288cd705ebe261521e198e80c700f4a52a722372 (diff) | |
parent | 95fd1630740dfee9399e5462a26ba70e51d89787 (diff) |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_view2d_types.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index e9178c0cbf5..856d48e395b 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -628,7 +628,7 @@ enum { /* Bitflags affecting behavior of any kind of sorting. */ /** Special flag to indicate that order is locked (not user-changeable). */ UILST_FLT_SORT_LOCK = 1u << 30, - /** Special value, bitflag used to reverse order! */ + /** Special value, bit-flag used to reverse order! */ UILST_FLT_SORT_REVERSE = 1u << 31, }; diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index ac553c2655f..4d2af01e4a1 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -1162,7 +1162,7 @@ typedef enum eUserpref_StatusBar_Flag { * #UserDef.autokey_mode */ typedef enum eAutokey_Mode { - /* AUTOKEY_ON is a bitflag */ + /* AUTOKEY_ON is a bit-flag. */ AUTOKEY_ON = 1, /** diff --git a/source/blender/makesdna/DNA_view2d_types.h b/source/blender/makesdna/DNA_view2d_types.h index c8498f096ed..d08865cefb5 100644 --- a/source/blender/makesdna/DNA_view2d_types.h +++ b/source/blender/makesdna/DNA_view2d_types.h @@ -29,7 +29,7 @@ typedef struct View2D { /** Allowable zoom factor range (only when (keepzoom & V2D_LIMITZOOM)) is set. */ float minzoom, maxzoom; - /** Scroll - scrollbars to display (bitflag). */ + /** Scroll - scrollbars to display (bit-flag). */ short scroll; /** Scroll_ui - temp settings used for UI drawing of scrollers. */ short scroll_ui; |