Revision: 18649
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18649
Author: aligorith
Date: 2009-01-24 12:35:14 +0100 (Sat, 24 Jan 2009)
Log Message:
-----------
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).
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_key.c
Modified:
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
2009-01-24 10:58:34 UTC (rev 18648)
+++ branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
2009-01-24 11:35:14 UTC (rev 18649)
@@ -2109,8 +2109,6 @@
}
printf("Ob '%s' - Successfully added %d Keyframes \n",
id->name+2, success);
-
-
}
CTX_DATA_END;
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_key.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_key.c
2009-01-24 10:58:34 UTC (rev 18648)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_key.c
2009-01-24 11:35:14 UTC (rev 18649)
@@ -268,11 +268,9 @@
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.");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs