diff options
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 56 |
1 files changed, 47 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 65e1f433c20..001964087b8 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1639,8 +1639,46 @@ static NlaEvalChannel *nlaevalchan_find_match(ListBase *channels, PointerRNA *pt return NULL; } +/* initialise default value for NlaEvalChannel, so that it doesn't blend things wrong */ +static void nlaevalchan_value_init(NlaEvalChannel *nec) +{ + PointerRNA *ptr = &nec->ptr; + PropertyRNA *prop = nec->prop; + int index = nec->index; + + /* NOTE: while this doesn't work for all RNA properties as default values aren't in fact + * set properly for most of them, at least the common ones (which also happen to get used + * in NLA strips a lot, e.g. scale) are set correctly. + */ + switch (RNA_property_type(prop)) { + case PROP_BOOLEAN: + if (RNA_property_array_length(ptr, prop)) + nec->value = (float)RNA_property_boolean_get_default_index(ptr, prop, index); + else + nec->value = (float)RNA_property_boolean_get_default(ptr, prop); + break; + case PROP_INT: + if (RNA_property_array_length(ptr, prop)) + nec->value = (float)RNA_property_int_get_default_index(ptr, prop, index); + else + nec->value = (float)RNA_property_int_get_default(ptr, prop); + break; + case PROP_FLOAT: + if (RNA_property_array_length(ptr, prop)) + nec->value = RNA_property_float_get_default_index(ptr, prop, index); + else + nec->value = RNA_property_float_get_default(ptr, prop); + break; + case PROP_ENUM: + nec->value = (float)RNA_property_enum_get_default(ptr, prop); + break; + default: + break; + } +} + /* verify that an appropriate NlaEvalChannel for this F-Curve exists */ -static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, ListBase *channels, NlaEvalStrip *nes, FCurve *fcu, short *newChan) +static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, ListBase *channels, NlaEvalStrip *nes, FCurve *fcu) { NlaEvalChannel *nec; NlaStrip *strip = nes->strip; @@ -1674,22 +1712,23 @@ static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, ListBase *channels, N /* allocate a new struct for this if none found */ if (nec == NULL) { nec = MEM_callocN(sizeof(NlaEvalChannel), "NlaEvalChannel"); - *newChan = 1; BLI_addtail(channels, nec); + /* store property links for writing to the property later */ nec->ptr = new_ptr; nec->prop = prop; nec->index = fcu->array_index; + + /* initialise value using default value of property [#35856] */ + nlaevalchan_value_init(nec); } - else - *newChan = 0; /* we can now return */ return nec; } /* accumulate (i.e. blend) the given value on to the channel it affects */ -static void nlaevalchan_accumulate(NlaEvalChannel *nec, NlaEvalStrip *nes, short UNUSED(newChan), float value) +static void nlaevalchan_accumulate(NlaEvalChannel *nec, NlaEvalStrip *nes, float value) { NlaStrip *strip = nes->strip; short blendmode = strip->blendmode; @@ -1756,7 +1795,7 @@ static void nlaevalchan_buffers_accumulate(ListBase *channels, ListBase *tmp_buf * otherwise, add the current channel to the buffer for efficiency */ if (necd) - nlaevalchan_accumulate(necd, nes, 0, nec->value); + nlaevalchan_accumulate(necd, nes, nec->value); else { BLI_remlink(tmp_buffer, nec); BLI_addtail(channels, nec); @@ -1853,7 +1892,6 @@ static void nlastrip_evaluate_actionclip(PointerRNA *ptr, ListBase *channels, Li for (fcu = strip->act->curves.first; fcu; fcu = fcu->next) { NlaEvalChannel *nec; float value = 0.0f; - short newChan = -1; /* check if this curve should be skipped */ if (fcu->flag & (FCURVE_MUTED | FCURVE_DISABLED)) @@ -1875,9 +1913,9 @@ static void nlastrip_evaluate_actionclip(PointerRNA *ptr, ListBase *channels, Li /* get an NLA evaluation channel to work with, and accumulate the evaluated value with the value(s) * stored in this channel if it has been used already */ - nec = nlaevalchan_verify(ptr, channels, nes, fcu, &newChan); + nec = nlaevalchan_verify(ptr, channels, nes, fcu); if (nec) - nlaevalchan_accumulate(nec, nes, newChan, value); + nlaevalchan_accumulate(nec, nes, value); } /* unlink this strip's modifiers from the parent's modifiers again */ |