diff options
author | Jacques Lucke <jacques@blender.org> | 2020-02-17 17:07:46 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-02-17 17:07:46 +0300 |
commit | 7f35aa99c7c89108063622d222a51b40d2ea9c55 (patch) | |
tree | 2ff90b4816de7224614403bced89d795d4dbed78 /release/scripts | |
parent | 1945a2325910270980da9decad7c5af9bab0b661 (diff) | |
parent | dcb905a58f59bf0f04249475e266d4b3929caaf0 (diff) |
Merge branch 'master' into functions
Diffstat (limited to 'release/scripts')
12 files changed, 69 insertions, 28 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 2034b2ac55c..61c3a8dd52c 100644 --- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -166,7 +166,8 @@ def print_info(reports, pot): spell_errors = check_ctxt.get("spell_errors") # XXX Temp, no multi_rnatip nor py_in_rna, see below. - keys = multi_lines | not_capitalized | end_point | undoc_ops | spell_errors.keys() + # Also, multi-lines tooltips are valid now. + keys = not_capitalized | end_point | undoc_ops | spell_errors.keys() if keys: _print("WARNINGS:") for key in keys: diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py index c81558db587..e96c94d4f4e 100644 --- a/release/scripts/modules/bl_i18n_utils/settings.py +++ b/release/scripts/modules/bl_i18n_utils/settings.py @@ -288,9 +288,14 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "along %s Y", "along %s Z", "along local Z", + "arccos(A)", + "arcsin(A)", + "arctan(A)", "ascii", "author", # Addons' field. :/ "bItasc", + "cos(A)", + "cosh(A)", "dbl-", # Compacted for 'double', for keymap items. "description", # Addons' field. :/ "dx", @@ -326,10 +331,15 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "re", "res", "rv", + "sin(A)", "sin(x) / x", + "sinh(A)", "sqrt(x*x+y*y+z*z)", "sRGB", + "tan(A)", + "tanh(A)", "utf-8", + "uv_on_emitter() requires a modifier from an evaluated object", "var", "vBVH", "view", @@ -346,6 +356,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "custom matrix", "custom orientation", "edge data", + "exp(A)", "expected a timeline/animation area to be active", "expected a view3d region", "expected a view3d region & editcurve", @@ -357,6 +368,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "image format is read-only", "image path can't be written to", "in memory to enable editing!", + "insufficient content", "jumps over", "left", "local", @@ -365,6 +377,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "normal", "right", "the lazy dog", + "trunc(A)", "unable to load movie clip", "unable to load text", "unable to open the file", @@ -386,11 +399,15 @@ WARN_MSGID_END_POINT_ALLOWED = { "Circle|Alt .", "Float Neg. Exp.", "Max Ext.", + "Newer graphics drivers may be available to improve Blender support.", "Numpad .", "Pad.", " RNA Path: bpy.types.", "Temp. Diff.", "Temperature Diff.", + "The program will now close.", + "Your graphics card or driver has limited support. It may work, but with issues.", + "Your graphics card or driver is not supported.", } PARSER_CACHE_HASH = 'sha1' diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py index 3418b4af769..052b3de0d7c 100644 --- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -32,15 +32,18 @@ class SpellChecker: # These must be all lower case for comparisons uimsgs = { # OK words - "adaptively", + "adaptively", "adaptivity", "aren", # aren't "betweens", # yuck! in-betweens! "boolean", "booleans", + "chamfer", "couldn", # couldn't "decrement", "derivate", "deterministically", "doesn", # doesn't + "duplications", + "effector", "equi", # equi-angular, etc. "fader", "globbing", @@ -105,7 +108,7 @@ class SpellChecker: "deadzone", "deconstruct", "defocus", - "denoise", "denoising", + "denoise", "denoised", "denoising", "denoiser", "deselect", "deselecting", "deselection", "despill", "despilling", "dirtree", @@ -211,7 +214,9 @@ class SpellChecker: "todo", "tradeoff", "un", + "unassociate", "unassociated", "unbake", + "unclosed", "uncomment", "unculled", "undeformed", @@ -230,10 +235,11 @@ class SpellChecker: "unreferenced", "unregister", "unselect", "unselected", "unselectable", - "unsubdivided", "unsubdivide", + "unsets", "unshadowed", "unspill", "unstitchable", + "unsubdivided", "unsubdivide", "untrusted", "vectorscope", "whitespace", "whitespaces", @@ -269,6 +275,7 @@ class SpellChecker: "scalings", "selectable", "selectability", "shaper", + "smoothen", "smoothening", "spherize", "spherized", "stitchable", "symmetrize", @@ -285,10 +292,13 @@ class SpellChecker: "aero", "amb", "anim", + "aov", "app", "bbox", "bboxes", + "bksp", # Backspace "bool", "calc", + "cfl", "config", "configs", "const", "coord", "coords", @@ -338,8 +348,12 @@ class SpellChecker: "subdiv", "sys", "tex", + "texcoord", "tmr", # timer "tri", "tris", + "udim", "udims", + "upres", # Upresolution + "usd", "uv", "uvs", "uvw", "uw", "uvmap", "ve", "vec", @@ -413,6 +427,7 @@ class SpellChecker: "vorticity", "waveform", "waveforms", "wildcard", "wildcards", + "wintab", # Some Windows tablet API # General computer graphics terms "anaglyph", @@ -437,6 +452,7 @@ class SpellChecker: "cuda", "deinterlace", "dropoff", + "duotone", "dv", "eigenvectors", "emissive", @@ -452,6 +468,7 @@ class SpellChecker: "linearlight", "lossless", "lossy", "luminance", + "mantaflow", "matcap", "midtones", "mipmap", "mipmaps", "mip", @@ -466,6 +483,7 @@ class SpellChecker: "raycasting", "raytrace", "raytracing", "raytraced", "refractions", + "remesher", "remeshing", "remesh", "renderfarm", "scanfill", "shader", "shaders", @@ -549,8 +567,9 @@ class SpellChecker: "shrinkwrap", "softbody", "stucci", - "sunsky", "subsurf", + "subtype", + "sunsky", "tessface", "tessfaces", "texface", "timeline", "timelines", @@ -712,7 +731,7 @@ class SpellChecker: "gltf", "gzip", "ico", - "jpg", "jpeg", + "jpg", "jpeg", "jpegs", "json", "matroska", "mdd", @@ -724,7 +743,7 @@ class SpellChecker: "osl", "oso", "piz", - "png", + "png", "pngs", "po", "quicktime", "rle", diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index d05a95e5c49..6d67c02a49c 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -1460,8 +1460,7 @@ def km_graph_editor(params): ("graph.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, {"properties": [("mode", 'RIGHT'), ("extend", False)]}), *_template_items_select_actions(params, "graph.select_all"), - ("graph.select_box", {"type": 'B', "value": 'PRESS'}, - {"properties": [("axis_range", False)]}), + ("graph.select_box", {"type": 'B', "value": 'PRESS'}, None), ("graph.select_box", {"type": 'B', "value": 'PRESS', "alt": True}, {"properties": [("axis_range", True)]}), ("graph.select_box", {"type": params.select_tweak, "value": 'ANY'}, diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 1eaaeb81772..310f1d6f8dc 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -207,7 +207,7 @@ class PHYSICS_PT_settings(PhysicButtonsPanel, Panel): note = layout.split() note_flag = False note.enabled = note_flag - note.label(icon='INFO', text="Unbaked Guides: Bake Guides or disable them.") + note.label(icon='INFO', text="Unbaked Guides: Bake Guides or disable them") split = layout.split() split.enabled = note_flag @@ -724,7 +724,7 @@ class PHYSICS_PT_noise(PhysicButtonsPanel, Panel): note = layout.split() note_flag = False note.enabled = note_flag - note.label(icon='INFO', text="Unbaked Data: Bake Data first.") + note.label(icon='INFO', text="Unbaked Data: Bake Data first") split = layout.split() split.enabled = domain.has_cache_baked_data and note_flag @@ -809,7 +809,7 @@ class PHYSICS_PT_mesh(PhysicButtonsPanel, Panel): note = layout.split() note_flag = False note.enabled = note_flag - note.label(icon='INFO', text="Unbaked Data: Bake Data first.") + note.label(icon='INFO', text="Unbaked Data: Bake Data first") split = layout.split() split.enabled = domain.has_cache_baked_data and note_flag @@ -921,7 +921,7 @@ class PHYSICS_PT_particles(PhysicButtonsPanel, Panel): note = layout.split() note_flag = False note.enabled = note_flag - note.label(icon='INFO', text="Unbaked Data: Bake Data first.") + note.label(icon='INFO', text="Unbaked Data: Bake Data first") split = layout.split() split.enabled = ( diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 8dd0eaf5445..8ff85459d35 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -275,7 +275,7 @@ class FILEBROWSER_PT_bookmarks_recents(Panel): bl_space_type = 'FILE_BROWSER' bl_region_type = 'TOOLS' bl_category = "Bookmarks" - bl_label = "Recents" + bl_label = "Recent" @classmethod def poll(cls, context): diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 2e853a287ea..c251d55714f 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -171,14 +171,10 @@ class GRAPH_MT_select(Menu): layout.separator() - props = layout.operator("graph.select_box") - props.axis_range = False - props.include_handles = False + layout.operator("graph.select_box") props = layout.operator("graph.select_box", text="Box Select (Axis Range)") props.axis_range = True - props.include_handles = False props = layout.operator("graph.select_box", text="Box Select (Include Handles)") - props.axis_range = False props.include_handles = True layout.operator("graph.select_circle") diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index 11fb20d8b38..6ac31aeb3d0 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -19,6 +19,10 @@ # <pep8 compliant> import bpy from bpy.types import Header, Menu, Panel +from bpy.app.translations import ( + contexts as i18n_contexts, + pgettext_iface as iface_, +) class OUTLINER_HT_header(Header): @@ -279,8 +283,10 @@ class OUTLINER_MT_object(Menu): if object_mode in {'EDIT', 'POSE'}: name = bpy.types.Object.bl_rna.properties["mode"].enum_items[object_mode].name - layout.operator("outliner.object_operation", text=f"{name:s} Set").type = 'OBJECT_MODE_ENTER' - layout.operator("outliner.object_operation", text=f"{name:s} Clear").type = 'OBJECT_MODE_EXIT' + layout.operator("outliner.object_operation", + text=iface_("%s Set", i18n_contexts.operator_default) % name).type = 'OBJECT_MODE_ENTER' + layout.operator("outliner.object_operation", + text=iface_("%s Clear", i18n_contexts.operator_default) % name).type = 'OBJECT_MODE_EXIT' del name layout.separator() diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 72583519800..788350025b9 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -404,7 +404,7 @@ class SEQUENCER_MT_select(Menu): layout.separator() layout.operator("sequencer.select_box", text="Box Select") - props = layout.operator("sequencer.select_box", text="Box Select (Handles)") + props = layout.operator("sequencer.select_box", text="Box Select (Include Handles)") props.include_handles = True layout.separator() @@ -1115,11 +1115,11 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): if i == strip.multicam_source: sub = row.row(align=True) sub.enabled = False - sub.operator("sequencer.cut_multicam", text=f"{i:d}").camera = i + sub.operator("sequencer.cut_multicam", text="%d" % i).camera = i else: sub_1 = row.row(align=True) sub_1.enabled = True - sub_1.operator("sequencer.cut_multicam", text=f"{i:d}").camera = i + sub_1.operator("sequencer.cut_multicam", text="%d" % i).camera = i if strip.channel > BT_ROW and (strip_channel - 1) % BT_ROW: for i in range(strip.channel, strip_channel + ((BT_ROW + 1 - strip_channel) % BT_ROW)): diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 02db00e36c0..cd1fc49ac8b 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -125,7 +125,7 @@ class _defs_view3d_generic: "\u2022 Drag ruler segment to measure an angle.\n" "\u2022 {} to remove the active ruler.\n" "\u2022 Ctrl while dragging to snap.\n" - "\u2022 Shift while dragging to measure surface thickness." + "\u2022 Shift while dragging to measure surface thickness" ).format( kmi_to_string_or_none(kmi_add), kmi_to_string_or_none(kmi_remove), @@ -456,6 +456,7 @@ class _defs_edit_armature: return dict( idname="builtin.extrude_to_cursor", label="Extrude to Cursor", + cursor='CROSSHAIR', icon="ops.armature.extrude_cursor", widget=None, keymap=(), @@ -710,6 +711,7 @@ class _defs_edit_mesh: return dict( idname="builtin.extrude_to_cursor", label="Extrude to Cursor", + cursor='CROSSHAIR', icon="ops.mesh.dupli_extrude_cursor", widget=None, keymap=(), @@ -892,7 +894,8 @@ class _defs_edit_curve: def extrude_cursor(): return dict( idname="builtin.extrude_cursor", - label="Extrude Cursor", + label="Extrude to Cursor", + cursor='CROSSHAIR', icon="ops.curve.extrude_cursor", widget=None, keymap=(), diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index ad36e6ab7a3..6d9071b0845 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1838,7 +1838,7 @@ class USERPREF_PT_addons(AddOnPanel, Panel): # WARNING: 2.8x exception, may be removed # use disabled state for old add-ons, chances are they are broken. if is_addon_27x: - sub.label(text="upgrade to 2.8x required") + sub.label(text="Upgrade to 2.8x required") sub.label(icon='ERROR') # Remove code above after 2.8x migration is complete. elif info["warning"]: diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index c074069af06..cf1b99cee89 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -706,7 +706,7 @@ class VIEW3D_PT_tools_brush_falloff(Panel, View3DPaintPanel, FalloffPanel): class VIEW3D_PT_tools_brush_falloff_frontface(View3DPaintPanel, Panel): bl_context = ".imagepaint" # dot on purpose (access from topbar) - bl_label = "Frontface Falloff" + bl_label = "Front-face Falloff" bl_parent_id = "VIEW3D_PT_tools_brush_falloff" bl_options = {'DEFAULT_CLOSED'} |