Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2017-01-03 01:42:50 +0300
committerJoshua Leung <aligorith@gmail.com>2017-01-03 01:42:50 +0300
commit65582e75e3eadfe8c9574219fd6a8cb547355526 (patch)
treec4a76658958904e7be530e62611093d23b8bc597
parent8f1f3a0d46df360f0715df5fa6d487f676940e89 (diff)
Fix: NLA "Strip Time" setting cannot be edited
This is a hacky fix for a regression introduced sometime after 2.76. The "Strip Time" setting on NLA Strips could not be edited without the value immediately jumping back to the current FCurve value (or 0.0 if no keyframes existed); even enabling autokey wouldn't let you key the property. Until we have proper overrides (that only lose their values on frame change), it's best that this setting is editable, even if it does mean it you have to manually change the frame to see the updated values.
-rw-r--r--source/blender/makesrna/intern/rna_nla.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c
index 078f6e237f0..e44a6420045 100644
--- a/source/blender/makesrna/intern/rna_nla.c
+++ b/source/blender/makesrna/intern/rna_nla.c
@@ -663,7 +663,10 @@ static void rna_def_nlastrip(BlenderRNA *brna)
prop = RNA_def_property(srna, "strip_time", PROP_FLOAT, PROP_TIME);
RNA_def_property_ui_text(prop, "Strip Time", "Frame of referenced Action to evaluate");
- RNA_def_property_update(prop, NC_ANIMATION | ND_NLA | NA_EDITED, "rna_NlaStrip_update");
+ /* XXX: Update temporarily disabled so that the property can be edited at all!
+ * Even autokey only applies after the curves have been re-evaluated, causing the unkeyed values to be lost
+ */
+ RNA_def_property_update(prop, NC_ANIMATION | ND_NLA | NA_EDITED, /*"rna_NlaStrip_update"*/ NULL);
/* TODO: should the animated_influence/time settings be animatable themselves? */
prop = RNA_def_property(srna, "use_animated_influence", PROP_BOOLEAN, PROP_NONE);