diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-04-02 13:24:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-02 13:24:57 +0300 |
| commit | f0e8334d1a4a3f72b787387a3789064d63adb1b0 (patch) | |
| tree | c3e7b6aadce51ce094fd8acbfaf457a4994aba28 /release | |
| parent | 049dec083aa987c6fc9e0da3d6eab270ee8ae912 (diff) | |
| parent | 2fc69d11c8a2df89c32a8bb320da2350fff7c8ba (diff) | |
Merge branch 'master' into alembic
Diffstat (limited to 'release')
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 7 |
3 files changed, 8 insertions, 1 deletions
diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 6cf8e325dba9c5afa1cb2a7cbf62159dd049e9b +Subproject 3fc5b82c6bdba2f9c954fbf497621b9bb794a1b diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index a3cf079f915..1186992b13e 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -1389,8 +1389,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): def CORRECTIVE_SMOOTH(self, layout, ob, md): is_bind = md.is_bind + layout.prop(md, "factor", text="Factor") layout.prop(md, "iterations") - layout.prop(md, "lambda_factor", text="Factor") row = layout.row() row.prop(md, "smooth_type") diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index ce1add12f54..da477e4e6be 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -19,6 +19,7 @@ # <pep8 compliant> import bpy from bpy.types import Header, Menu, Panel +from rna_prop_ui import PropertyPanel from bl_ui.properties_grease_pencil_common import GreasePencilDataPanel, GreasePencilToolsPanel from bpy.app.translations import pgettext_iface as iface_ @@ -1107,5 +1108,11 @@ class SEQUENCER_PT_grease_pencil_tools(GreasePencilToolsPanel, SequencerButtonsP # toolbar, which doesn't exist here... +class SEQUENCER_PT_custom_props(SequencerButtonsPanel, PropertyPanel, Panel): + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} + _context_path = "scene.sequence_editor.active_strip" + _property_type = (bpy.types.Sequence,) + + if __name__ == "__main__": # only for live edit. bpy.utils.register_module(__name__) |