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).
This commit is contained in:
Joshua Leung
2010-01-08 02:02:52 +00:00
parent cddd784e44
commit 28b1824fd0
3 changed files with 14 additions and 3 deletions

View File

@@ -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'