diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-01-08 05:02:52 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-01-08 05:02:52 +0300 |
| commit | 28b1824fd035ba56138846027290388ea373c1a4 (patch) | |
| tree | 72932b1019fb31d7f39e1ebef1d3ed4d5b6c9fb3 /release/scripts/ui/properties_data_mesh.py | |
| parent | cddd784e44c8ee4e7be535a4d105b8ebb65a304f (diff) | |
Bugfix #20605: Shape key values not keyable from mesh data panel. Keyable from Datablock browser.
See the bugreport comments for full breakdown of the fix.
--
The change in brush.c is to get blender compiling again, after my previous commit which tried to fix a compiler warning related to this (but in the header file instead).
Diffstat (limited to 'release/scripts/ui/properties_data_mesh.py')
| -rw-r--r-- | release/scripts/ui/properties_data_mesh.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/release/scripts/ui/properties_data_mesh.py b/release/scripts/ui/properties_data_mesh.py index c0f85685938..b8c5438ea78 100644 --- a/release/scripts/ui/properties_data_mesh.py +++ b/release/scripts/ui/properties_data_mesh.py @@ -150,7 +150,12 @@ class DATA_PT_shape_keys(DataButtonsPanel): ob = context.object key = ob.data.shape_keys - kb = ob.active_shape_key + if key and len(key.keys): + # this is so that we get the active shapekey from the + # shapekeys block, not from object data + kb = key.keys[ob.active_shape_key.name] + else: + kb = None wide_ui = context.region.width > narrowui enable_edit = ob.mode != 'EDIT' |