diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-22 23:49:02 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-22 23:49:02 +0300 |
| commit | 44f91a9a18d6d942d958e7640f4d1c301d230150 (patch) | |
| tree | e7e97a57a920f02e87b7539740590a5058f7614e /release | |
| parent | 6cc293a6d97a2f8277660613a1ced9b2688bd7c0 (diff) | |
| parent | 9b2923380092c7e3c771d354f8938c5ca20bfd9d (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/versioning_270.c
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 091ad89bc21..5df02c82e36 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -42,7 +42,7 @@ def draw_color_balance(layout, color_balance): col.label(text="Lift:") col.separator() col.separator() - col.prop(color_balance, "") + col.prop(color_balance, "lift", text="") col.prop(color_balance, "invert_lift", text="Invert", icon="ARROW_LEFTRIGHT") split.template_color_picker(color_balance, "lift", value_slider=True, cubic=True) @@ -52,7 +52,7 @@ def draw_color_balance(layout, color_balance): col.label(text="Gamma:") col.separator() col.separator() - col.prop(color_balance, "") + col.prop(color_balance, "gamma", text="") col.prop(color_balance, "invert_gamma", text="Invert", icon="ARROW_LEFTRIGHT") split.template_color_picker(color_balance, "gamma", value_slider=True, lock_luminosity=True, cubic=True) |