diff options
author | Campbell Barton <campbell@blender.org> | 2022-05-03 11:33:24 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-05-03 11:33:24 +0300 |
commit | cd1044fb2bdbdcac74704215e2f0baeb7dece39b (patch) | |
tree | 81cb04fa1edebf55e1c5b07196fcf24d59e534a3 | |
parent | 31bf70e35c521c72a992ec190b824b23c4eeac6f (diff) | |
parent | cfdec85cd991115813d94ae0fb85e1eae56ea168 (diff) |
Merge branch 'blender-v3.2-release'
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 2 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_view.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index d1c0c6c9dac..2f2c146b8cf 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -5687,7 +5687,7 @@ class VIEW3D_PT_object_type_visibility(Panel): bl_label = "View Object Types" bl_ui_units_x = 7 - # Allows derived classes to pass view data other than context.space_data. + # Allows derived classes to pass view data other than context.space_data. # This is used by the official VR add-on, which passes XrSessionSettings # since VR has a 3D view that only exists for the duration of the VR session. def draw_ex(self, context, view, show_select): diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c index d271ad1ec66..b3dbc3c72d1 100644 --- a/source/blender/editors/space_sequencer/sequencer_view.c +++ b/source/blender/editors/space_sequencer/sequencer_view.c @@ -31,8 +31,8 @@ /* For menu, popup, icons, etc. */ #include "ED_anim_api.h" #include "ED_screen.h" -#include "ED_util_imbuf.h" #include "ED_time_scrub_ui.h" +#include "ED_util_imbuf.h" /* Own include. */ #include "sequencer_intern.h" |