archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender-v2.91-release'

Browse Source
This commit is contained in:
Campbell Barton
2020-10-29 11:29:13 +11:00
parent cac8a7cddb 52b38d9c3d
commit 83f369a0b9
7 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/modules/sys_info.py
View File

@@ -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:

8
release/scripts/startup/bl_ui/space_dopesheet.py
View File

@@ -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:

8
release/scripts/startup/bl_ui/space_nla.py
View File

@@ -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):