From 911f9e00d13c57fb093b7ba7b930a340aa0a79a9 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Wed, 28 Oct 2020 14:06:26 -0400 Subject: Animation: Improve labels on Snap menu in NLA & Dopesheet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add "Selection to" as prefix for those menu items that move the selected keyframes to something, for both the Key → Snap menu and the Shift+S pie menu. No functional changes. This was missed in rB477d983c2e8ab298cbf638d5aadd77fad9c2f677 Differential Revision: https://developer.blender.org/D9304 --- release/scripts/startup/bl_ui/space_dopesheet.py | 8 ++++---- release/scripts/startup/bl_ui/space_nla.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index a866921f326..aa88fceaef7 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): -- cgit v1.2.3 From 52b38d9c3d84485385d5bc2e58f16c5acfaca9b7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 29 Oct 2020 09:33:15 +1100 Subject: PyAPI: point sys.executable to the Python binary `sys.executable` is documented to be a Python interpreter or None. This was set to Blender's executable which caused the multiprocessing module to spawn new instances of Blender instead of Python on WIN32. See issue described in D7815. Deprecate 'bpy.app.binary_path_python' & warn when using. Blender's executable remains accessible via `bpy.app.binary_path`. Modified 04c5471ceefb4, setting `sys.executable` instead of using Py_SetProgramName, which is needed for a bundled Python installation. --- release/scripts/modules/sys_info.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'release') 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: -- cgit v1.2.3