blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Aaron Carlisle 2021-11-16 17:50:24 -05:00
parent 93f26d652e f829b86039
commit 2f39b45e8c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit 8ee2942570f08d10484bb2328d0d1b0aaaa0367c
Subproject commit 6178bad247c69c9c4e1a98c5f35765752341b3ae

2
release/scripts/addons

@ -1 +1 @@
Subproject commit f2a08d80ccd3c13af304525778df3905f95bd44d
Subproject commit f6107e2fd9a92b55ac110c7db941e287e2f6604a

2
source/blender/editors/interface/interface_handlers.c
View File

@ -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 */

2
source/tools

@ -1 +1 @@
Subproject commit 2e8c879248822c8e500ed49d79acc605e5aa75b9
Subproject commit b22d19e47f4d0353082f3d9f30ee8d244c5266d5