From 6d6bb2d1301019218af34e9f80e86dddcbbabafc Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 11 Jan 2014 00:59:22 +0100 Subject: [PATCH] Fix T38145: python error popup when pressing shift+Z in blender game mode. --- release/scripts/startup/bl_operators/wm.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 6a54a1ea15c..a249d3dffdc 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -347,11 +347,16 @@ class WM_OT_context_toggle_enum(Operator): if context_path_validate(context, data_path) is Ellipsis: return {'PASS_THROUGH'} - exec("context.%s = ('%s', '%s')[context.%s != '%s']" % - (data_path, self.value_1, - self.value_2, data_path, - self.value_2, - )) + # failing silently is not ideal, but we don't want errors for shortcut + # keys that some values that are only available in a particular context + try: + exec("context.%s = ('%s', '%s')[context.%s != '%s']" % + (data_path, self.value_1, + self.value_2, data_path, + self.value_2, + )) + except: + return {'PASS_THROUGH'} return operator_path_undo_return(context, data_path)