diff options
author | Jacques Lucke <jacques@blender.org> | 2020-02-19 12:17:36 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-02-19 12:17:36 +0300 |
commit | 3fe710aeafd4199afc4bfdbab810df00a079c0fa (patch) | |
tree | de19bfbeb5e171bec9873cf43d047f995106f436 /release/scripts | |
parent | 6399bfcee3a408c68c6321dc6f8a9c46f9c511a7 (diff) | |
parent | d54a4a32f386890c39a4d0b783b957a0619af3a5 (diff) |
Merge branch 'master' into functions
Diffstat (limited to 'release/scripts')
6 files changed, 46 insertions, 13 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py index 1123f69966f..20c5c869e83 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -1727,10 +1727,8 @@ def km_sequencer(params): ("sequencer.select_all", {"type": 'A', "value": 'PRESS', "ctrl": True}, {"properties": [("action", 'SELECT')]}), ("sequencer.select_all", {"type": 'A', "value": 'PRESS', "ctrl": True, "shift": True}, {"properties": [("action", 'DESELECT')]}), ("sequencer.select_all", {"type": 'I', "value": 'PRESS', "ctrl": True}, {"properties": [("action", 'INVERT')]}), - ("sequencer.cut", {"type": 'K', "value": 'PRESS'}, + ("sequencer.split", {"type": 'B', "value": 'PRESS', "ctrl": True}, {"properties": [("type", 'SOFT')]}), - ("sequencer.cut", {"type": 'K', "value": 'PRESS', "shift": True}, - {"properties": [("type", 'HARD')]}), ("sequencer.mute", {"type": 'M', "value": 'PRESS'}, {"properties": [("unselected", False)]}), ("sequencer.mute", {"type": 'M', "value": 'PRESS', "shift": True}, @@ -1779,7 +1777,7 @@ def km_sequencer(params): ("sequencer.snap", {"type": 'X', "value": 'PRESS'}, None), ("sequencer.swap_inputs", {"type": 'S', "value": 'PRESS', "alt": True}, None), *( - (("sequencer.cut_multicam", + (("sequencer.split_multicam", {"type": NUMBERS_1[i], "value": 'PRESS'}, {"properties": [("camera", i + 1)]}) for i in range(10) @@ -1804,7 +1802,6 @@ def km_sequencer(params): ("sequencer.select_linked_pick", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "shift": True}, {"properties": [("extend", True)]}), ("sequencer.select_linked", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "ctrl": True}, None), - ("sequencer.select_box", {"type": 'Q', "value": 'PRESS'}, None), ("sequencer.select_box", {"type": 'EVT_TWEAK_L', "value": 'ANY'}, {"properties":[("tweak", True), ("mode", 'SET')]}), ("sequencer.select_box", {"type": 'EVT_TWEAK_L', "value": 'ANY', "shift": True}, @@ -1823,6 +1820,9 @@ def km_sequencer(params): *_template_items_context_menu("SEQUENCER_MT_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), ("marker.add", {"type": 'M', "value": 'PRESS'}, None), ("marker.rename", {"type": 'RET', "value": 'PRESS'}, None), + # Tools + op_tool_cycle("builtin.select_box", {"type": 'Q', "value": 'PRESS'}), + op_tool_cycle("builtin.blade", {"type": 'B', "value": 'PRESS'}), ]) return keymap diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 31892fda668..f216acb2f0f 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -170,7 +170,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): if md.limit_method == 'ANGLE': layout.prop(md, "angle_limit") elif md.limit_method == 'VGROUP': - layout.prop_search(md, "vertex_group", ob, "vertex_groups", text="") + row = layout.row(align=True) + row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") + row.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT') layout.label(text="Face Strength Mode:") layout.row().prop(md, "face_strength_mode", expand=True) @@ -423,7 +425,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col = split.column() col.label(text="Vertex Group:") - col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") + row = col.row(align=True) + row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") + row.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT') sub = col.column() sub.active = bool(md.vertex_group) sub.prop(md, "protect") @@ -497,6 +501,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): row = layout.row() row.enabled = not is_bind row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") + row.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT') layout.separator() @@ -525,7 +530,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "use_normalized") layout.label(text="Vertex Group:") - layout.prop_search(md, "vertex_group", ob, "vertex_groups", text="") + row = layout.row(align=True) + row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") + row.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT') def LATTICE(self, layout, ob, md): split = layout.split() @@ -1472,7 +1479,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col = split.column() col.label(text="Vertex Group:") - col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") + row = col.row(align=True) + row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") + row.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT') col = split.column() col.label(text="UV Map:") diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index b4c864c16cd..9c422b58ee5 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -524,6 +524,25 @@ class RENDER_PT_eevee_hair(RenderButtonsPanel, Panel): layout.prop(rd, "hair_subdiv") +class RENDER_PT_eevee_performance(RenderButtonsPanel, Panel): + bl_label = "Performance" + bl_options = {'DEFAULT_CLOSED'} + COMPAT_ENGINES = {'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} + + @classmethod + def poll(cls, context): + return (context.engine in cls.COMPAT_ENGINES) + + def draw(self, context): + layout = self.layout + scene = context.scene + rd = scene.render + + layout.use_property_split = True + + layout.prop(rd, "use_high_quality_normals") + + class RENDER_PT_opengl_sampling(RenderButtonsPanel, Panel): bl_label = "Sampling" COMPAT_ENGINES = {'BLENDER_WORKBENCH'} @@ -674,6 +693,7 @@ classes = ( RENDER_PT_eevee_volumetric, RENDER_PT_eevee_volumetric_lighting, RENDER_PT_eevee_volumetric_shadows, + RENDER_PT_eevee_performance, RENDER_PT_eevee_hair, RENDER_PT_eevee_shadows, RENDER_PT_eevee_indirect_lighting, diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 788350025b9..f1a349d49b4 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -783,7 +783,7 @@ class SEQUENCER_MT_context_menu(Menu): layout.operator_context = 'INVOKE_REGION_WIN' - layout.operator("sequencer.cut", text="Cut").type = 'SOFT' + layout.operator("sequencer.split", text="Split").type = 'SOFT' 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="%d" % i).camera = i + sub.operator("sequencer.split_multicam", text="%d" % i).camera = i else: sub_1 = row.row(align=True) sub_1.enabled = True - sub_1.operator("sequencer.cut_multicam", text="%d" % i).camera = i + sub_1.operator("sequencer.split_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_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index b632d07939e..7d880f4892f 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -6940,7 +6940,10 @@ class VIEW3D_PT_sculpt_context_menu(Panel): layout.prop(brush, "normal_weight", slider=True) if capabilities.has_pinch_factor: - layout.prop(brush, "crease_pinch_factor", slider=True, text="Pinch") + text = "Pinch" + if brush.sculpt_tool in {'BLOB', 'SNAKE_HOOK'}: + text = "Magnify" + layout.prop(brush, "crease_pinch_factor", slider=True, text=text) if capabilities.has_rake_factor: layout.prop(brush, "rake_factor", slider=True) diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index d9a374503b3..969a1ca1bd7 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -264,6 +264,7 @@ shader_node_categories = [ NodeItem("ShaderNodeNormalMap"), NodeItem("ShaderNodeNormal"), NodeItem("ShaderNodeVectorCurve"), + NodeItem("ShaderNodeVectorRotate"), NodeItem("ShaderNodeVectorTransform"), ]), ShaderNodeCategory("SH_NEW_CONVERTOR", "Converter", items=[ |