From e71d531238bf998f0ee5b06561462c84b89cce0d Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Sat, 24 Jan 2009 11:35:14 +0000 Subject: Animato - Shapekeys work again The RNA-wrapping for the 'value' (internally kb->curval) was set to be not editable, thus preventing Animato from writing to it. Removing the flag makes shapekeys more functional again (there are still a few non-functional cases). --- source/blender/editors/animation/keyframing.c | 2 -- source/blender/makesrna/intern/rna_key.c | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'source') diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 000812c6baa..7ab5a790e97 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -2109,8 +2109,6 @@ static int insert_key_exec (bContext *C, wmOperator *op) } printf("Ob '%s' - Successfully added %d Keyframes \n", id->name+2, success); - - } CTX_DATA_END; diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index cd133793500..48fc116d0bb 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -268,11 +268,9 @@ static void rna_def_keyblock(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_NOT_EDITABLE); RNA_def_property_float_sdna(prop, NULL, "pos"); RNA_def_property_ui_text(prop, "Frame", "Frame for absolute keys."); - - /* the current value isn't easily editable this way, it's linked to an IPO. - * these seem to be mostly the values that are being written to, not edited */ + + /* for now, this is editable directly, as users can set this even if they're not animating them (to test results) */ prop= RNA_def_property(srna, "value", PROP_FLOAT, PROP_NONE); - RNA_def_property_flag(prop, PROP_NOT_EDITABLE); RNA_def_property_float_sdna(prop, NULL, "curval"); RNA_def_property_ui_text(prop, "Value", "Value of shape key at the current frame."); -- cgit v1.2.3