diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-10-29 03:29:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-10-29 03:29:13 +0300 |
| commit | 83f369a0b917fbf4e554d65c1d28eaa67f5a96de (patch) | |
| tree | bdc33d505ed2b18c4c5078ed5d24e1150721492b /release | |
| parent | cac8a7cddb56a654145ed1c9db2add8abff12704 (diff) | |
| parent | 52b38d9c3d84485385d5bc2e58f16c5acfaca9b7 (diff) | |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/modules/sys_info.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 8 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_nla.py | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/release/scripts/modules/sys_info.py b/release/scripts/modules/sys_info.py index fc3ffe4dd88..cb80529f0f3 100644 --- a/release/scripts/modules/sys_info.py +++ b/release/scripts/modules/sys_info.py @@ -82,10 +82,10 @@ def write_sysinfo(filepath): output.write("\t%r\n" % p) output.write(title("Python (External Binary)")) - output.write("binary path: %s\n" % prepr(bpy.app.binary_path_python)) + output.write("binary path: %s\n" % prepr(sys.executable)) try: py_ver = prepr(subprocess.check_output([ - bpy.app.binary_path_python, + sys.executable, "--version", ]).strip()) except Exception as e: diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 5e53eec4ae6..9a716621b08 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -668,10 +668,10 @@ class DOPESHEET_MT_snap_pie(Menu): layout = self.layout pie = layout.menu_pie() - pie.operator("action.snap", text="Current Frame").type = 'CFRA' - pie.operator("action.snap", text="Nearest Frame").type = 'NEAREST_FRAME' - pie.operator("action.snap", text="Nearest Second").type = 'NEAREST_SECOND' - pie.operator("action.snap", text="Nearest Marker").type = 'NEAREST_MARKER' + pie.operator("action.snap", text="Selection to Current Frame").type = 'CFRA' + pie.operator("action.snap", text="Selection to Nearest Frame").type = 'NEAREST_FRAME' + pie.operator("action.snap", text="Selection to Nearest Second").type = 'NEAREST_SECOND' + pie.operator("action.snap", text="Selection to Nearest Marker").type = 'NEAREST_MARKER' class LayersDopeSheetPanel: diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py index 4ecc4e7fdd9..d472352084c 100644 --- a/release/scripts/startup/bl_ui/space_nla.py +++ b/release/scripts/startup/bl_ui/space_nla.py @@ -241,10 +241,10 @@ class NLA_MT_snap_pie(Menu): layout = self.layout pie = layout.menu_pie() - pie.operator("nla.snap", text="Current Frame").type = 'CFRA' - pie.operator("nla.snap", text="Nearest Frame").type = 'NEAREST_FRAME' - pie.operator("nla.snap", text="Nearest Second").type = 'NEAREST_SECOND' - pie.operator("nla.snap", text="Nearest Marker").type = 'NEAREST_MARKER' + pie.operator("nla.snap", text="Selection to Current Frame").type = 'CFRA' + pie.operator("nla.snap", text="Selection to Nearest Frame").type = 'NEAREST_FRAME' + pie.operator("nla.snap", text="Selection to Nearest Second").type = 'NEAREST_SECOND' + pie.operator("nla.snap", text="Selection to Nearest Marker").type = 'NEAREST_MARKER' class NLA_MT_context_menu(Menu): |