diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-04-01 10:26:41 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-04-01 10:26:41 +0400 |
| commit | c46a955ee0e13d812780f8afe78a6a9c34bb84fa (patch) | |
| tree | 30d4dbcfc9eb107c71235087151ed1dd56b4306b /release | |
| parent | ceebd182ed2e3310d6b65fa73574b941156aa1b0 (diff) | |
Assorted animsys fixes/tweaks:
* Fixed all the dangerous code added in 27907. Using the code there, scripters could corrupt animation files in ways which would render them useless, with channels not appearing in any animation editors, and others not getting evaluated at all.
* Partial fix of bug 21818, by disabling destructive replacement of keyframes. Will followup this commit with a more comprehensive commit which gets rid of the rest of the problems, by incorporating some requests from Durian team.
* Fixed problems with users being able to see+edit the name of the active Keying Set in the Scene buttons. There is still a bug though with the list widget given how the indices are now interpreted...
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/keyingsets/keyingsets_utils.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/properties_scene.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/release/scripts/keyingsets/keyingsets_utils.py b/release/scripts/keyingsets/keyingsets_utils.py index 3d57130b6e5..2b0793fe36b 100644 --- a/release/scripts/keyingsets/keyingsets_utils.py +++ b/release/scripts/keyingsets/keyingsets_utils.py @@ -81,7 +81,7 @@ def get_transform_generators_base_info(data): path = "" # data on ID-blocks directly should get grouped by the KeyingSet - grouping = None; + grouping = None else: # get the path to the ID-block path = data.path_to_id() diff --git a/release/scripts/ui/properties_scene.py b/release/scripts/ui/properties_scene.py index 714f22f5ca6..ff1de25673e 100644 --- a/release/scripts/ui/properties_scene.py +++ b/release/scripts/ui/properties_scene.py @@ -89,6 +89,7 @@ class SCENE_PT_keying_sets(SceneButtonsPanel): row = layout.row() col = row.column() + # XXX: this fails because index is not what this expects... col.template_list(scene, "keying_sets", scene, "active_keying_set_index", rows=2) col = row.column(align=True) @@ -96,7 +97,7 @@ class SCENE_PT_keying_sets(SceneButtonsPanel): col.operator("anim.keying_set_remove", icon='ZOOMOUT', text="") ks = scene.active_keying_set - if ks: + if ks and ks.absolute: row = layout.row() col = row.column() @@ -310,8 +311,10 @@ class ANIM_OT_keying_set_export(bpy.types.Operator): f.write("%s, '%s'" % (id_bpy_path, ksp.data_path)) # array index settings (if applicable) - if ksp.entire_array is False: - f.write(", entire_array=False, array_index=%d" % ksp.array_index) + if ksp.entire_array: + f.write(", index=-1") + else: + f.write(", index=%d" % ksp.array_index) # grouping settings (if applicable) # NOTE: the current default is KEYINGSET, but if this changes, change this code too |