diff options
| author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2021-11-17 01:50:24 +0300 |
|---|---|---|
| committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2021-11-17 01:50:24 +0300 |
| commit | 2f39b45e8cb59f4362d86c9ae1246ea5740e0bb8 (patch) | |
| tree | db2ceb0dd7d0985e75da088fd291569554cabeab | |
| parent | 93f26d652e2727edbb1ebb5ffefc00e039a17599 (diff) | |
| parent | f829b86039cb00e2f4acc18baa004c3ca9dc72a0 (diff) | |
Merge branch 'blender-v3.0-release'
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 2 | ||||
| m--------- | source/tools | 0 |
4 files changed, 1 insertions, 1 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 8ee2942570f08d10484bb2328d0d1b0aaaa0367 +Subproject 6178bad247c69c9c4e1a98c5f35765752341b3a diff --git a/release/scripts/addons b/release/scripts/addons -Subproject f2a08d80ccd3c13af304525778df3905f95bd44 +Subproject f6107e2fd9a92b55ac110c7db941e287e2f6604 diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 244d5b51ffd..8a744a1edbe 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -10312,7 +10312,7 @@ static int ui_handle_menu_event(bContext *C, retval = WM_UI_HANDLER_BREAK; break; - /* Smooth scrolling for pocopy_v2_v2_int(&povers. */ + /* Smooth scrolling for popovers. */ case MOUSEPAN: { if (IS_EVENT_MOD(event, shift, ctrl, alt, oskey)) { /* pass */ diff --git a/source/tools b/source/tools -Subproject 2e8c879248822c8e500ed49d79acc605e5aa75b +Subproject b22d19e47f4d0353082f3d9f30ee8d244c5266d |