diff options
author | Joshua Leung <aligorith@gmail.com> | 2015-01-26 09:15:46 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2015-01-26 09:19:33 +0300 |
commit | 8db4a24e4efc6d94e69e790a1ce3179f2e9948e7 (patch) | |
tree | 1b3db1be1fd90b3797681755f7256f4f90289b6b /release | |
parent | 146a0e94477372f3dc5e52902cc99aba642c5a9c (diff) |
Bugfix T43343: Buttons for Keyframing Settings are Mutually Exclusive
Since 1c3f2354f83b3e79dee31d837ca4d7c08d2c3f26 the keyframing settings on
Keying Sets have been incorrectly displayed as a clump of toggle buttons,
which are usually only used when only one of the options apply.
Reverting this back to how it was, while leaving bl_options in place still for
the one case where it makes sense to do it that way (i.e. for KeyingSetInfo)
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_operators/anim.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_scene.py | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py index 39bb7e90948..36445d742e2 100644 --- a/release/scripts/startup/bl_operators/anim.py +++ b/release/scripts/startup/bl_operators/anim.py @@ -84,7 +84,9 @@ class ANIM_OT_keying_set_export(Operator): f.write("ks.is_path_absolute = False\n") f.write("\n") - f.write("ks.bl_options = %r\n" % ks.bl_options) + f.write("ks.use_insertkey_needed = %s\n" % ks.use_insertkey_needed) + f.write("ks.use_insertkey_visual = %s\n" % ks.use_insertkey_visual) + f.write("ks.use_insertkey_xyz_to_rgb = %s\n" % ks.use_insertkey_xyz_to_rgb) f.write("\n") # -------------------------------------------------------- diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index d172596d51f..5d822cef9af 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -115,7 +115,9 @@ class SCENE_PT_keying_sets(SceneButtonsPanel, Panel): col = row.column() col.label(text="Keyframing Settings:") - col.prop(ks, "bl_options") + col.prop(ks, "use_insertkey_needed", text="Needed") + col.prop(ks, "use_insertkey_visual", text="Visual") + col.prop(ks, "use_insertkey_xyz_to_rgb", text="XYZ to RGB") class SCENE_PT_keying_set_paths(SceneButtonsPanel, Panel): @@ -171,7 +173,9 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel, Panel): col = row.column() col.label(text="Keyframing Settings:") - col.prop(ksp, "bl_options") + col.prop(ksp, "use_insertkey_needed", text="Needed") + col.prop(ksp, "use_insertkey_visual", text="Visual") + col.prop(ksp, "use_insertkey_xyz_to_rgb", text="XYZ to RGB") class SCENE_PT_color_management(SceneButtonsPanel, Panel): |