diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /release/scripts/startup/bl_ui | |
parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'release/scripts/startup/bl_ui')
-rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 459fd4c5f48..ae9a525fdf9 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -926,7 +926,7 @@ class CLIP_PT_stabilization(CLIP_PT_reconstruction_panel, Panel): sub.menu('CLIP_MT_stabilize_2d_specials', text="", icon='DOWNARROW_HLT') - # Usually we don't hide things from iterface, but here every pixel of + # Usually we don't hide things from interface, but here every pixel of # vertical space is precious. if stab.use_stabilize_rotation: box.label(text="Tracks For Rotation / Scale") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 5d4b5f4e25a..4ded8e6f1e6 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1461,7 +1461,7 @@ class VIEW3D_MT_add(Menu): def draw(self, context): layout = self.layout - # note, don't use 'EXEC_SCREEN' or operators wont get the 'v3d' context. + # note, don't use 'EXEC_SCREEN' or operators won't get the 'v3d' context. # Note: was EXEC_AREA, but this context does not have the 'rv3d', which prevents # "align_view" to work on first call (see [#32719]). |