diff options
Diffstat (limited to 'release/scripts/modules')
| -rw-r--r-- | release/scripts/modules/bl_i18n_utils/bl_extract_messages.py | 4 | ||||
| -rw-r--r-- | release/scripts/modules/bl_i18n_utils/utils.py | 2 | ||||
| -rw-r--r-- | release/scripts/modules/bpy_extras/view3d_utils.py | 8 | ||||
| -rw-r--r-- | release/scripts/modules/bpy_types.py | 2 | ||||
| -rw-r--r-- | release/scripts/modules/console/complete_namespace.py | 2 | ||||
| -rw-r--r-- | release/scripts/modules/rna_xml.py | 5 |
6 files changed, 13 insertions, 10 deletions
diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py index ad2a70b84e8..8874ecceb77 100644 --- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -343,10 +343,10 @@ def dump_rna_messages(msgs, reports, settings, verbose=False): process_msg(msgs, default_context, cls.__doc__, msgsrc, reports, check_ctxt_rna_tip, settings) # Panels' "tabs" system. - if hasattr(bl_rna, 'bl_category') and bl_rna.bl_category: + if hasattr(bl_rna, 'bl_category') and bl_rna.bl_category: process_msg(msgs, default_context, bl_rna.bl_category, msgsrc, reports, check_ctxt_rna, settings) - if hasattr(bl_rna, 'bl_label') and bl_rna.bl_label: + if hasattr(bl_rna, 'bl_label') and bl_rna.bl_label: process_msg(msgs, msgctxt, bl_rna.bl_label, msgsrc, reports, check_ctxt_rna, settings) walk_properties(cls) diff --git a/release/scripts/modules/bl_i18n_utils/utils.py b/release/scripts/modules/bl_i18n_utils/utils.py index 85977642bbb..911e1764698 100644 --- a/release/scripts/modules/bl_i18n_utils/utils.py +++ b/release/scripts/modules/bl_i18n_utils/utils.py @@ -1343,7 +1343,7 @@ class I18n: #key = self.settings.PO_HEADER_KEY #for uid, trans in self.trans.items(): #if key not in trans.msgs: - #trans.msgs[key] + #trans.msgs[key] self.unescape() def write(self, kind, langs=set()): diff --git a/release/scripts/modules/bpy_extras/view3d_utils.py b/release/scripts/modules/bpy_extras/view3d_utils.py index ad555a417d7..b25024fca9b 100644 --- a/release/scripts/modules/bpy_extras/view3d_utils.py +++ b/release/scripts/modules/bpy_extras/view3d_utils.py @@ -54,9 +54,13 @@ def region_2d_to_vector_3d(region, rv3d, coord): w = out.dot(persinv[3].xyz) + persinv[3][3] - return ((persinv * out) / w) - viewinv.translation + view_vector = ((persinv * out) / w) - viewinv.translation else: - return viewinv.col[2].xyz.normalized() + view_vector = -viewinv.col[2].xyz + + view_vector.normalize() + + return view_vector def region_2d_to_origin_3d(region, rv3d, coord): diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index bc2e9368b71..e19766310ec 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -694,7 +694,7 @@ class _GenericUI: draw_funcs = cls._dyn_ui_initialize() try: draw_funcs.remove(draw_func) - except: + except ValueError: pass diff --git a/release/scripts/modules/console/complete_namespace.py b/release/scripts/modules/console/complete_namespace.py index 74406d5e002..992bb72aa08 100644 --- a/release/scripts/modules/console/complete_namespace.py +++ b/release/scripts/modules/console/complete_namespace.py @@ -186,7 +186,7 @@ def complete(word, namespace, private=True): except Exception: return [] # ignore basic types - if type(obj) in (bool, float, int, str): + if type(obj) in {bool, float, int, str}: return [] # an extra char '[', '(' or '.' will be added if hasattr(obj, '__getitem__') and not is_struct_seq(obj): diff --git a/release/scripts/modules/rna_xml.py b/release/scripts/modules/rna_xml.py index 9776993b74b..41f890de51f 100644 --- a/release/scripts/modules/rna_xml.py +++ b/release/scripts/modules/rna_xml.py @@ -92,7 +92,6 @@ def rna2xml(fw=print_ln, bpy.types.Sequence, ) - def number_to_str(val, val_type): if val_type == int: return "%d" % val @@ -245,13 +244,13 @@ def xml2rna(root_xml, ): def rna2xml_node(xml_node, value): -# print("evaluating:", xml_node.nodeName) + # print("evaluating:", xml_node.nodeName) # --------------------------------------------------------------------- # Simple attributes for attr in xml_node.attributes.keys(): -# print(" ", attr) + # print(" ", attr) subvalue = getattr(value, attr, Ellipsis) if subvalue is Ellipsis: |