From 188dc880c6fea911dad840596f508696c9777c25 Mon Sep 17 00:00:00 2001 From: Wayde Moss Date: Wed, 9 Dec 2020 23:50:17 -0500 Subject: - clean up formatting and obselete comments --- source/blender/blenkernel/intern/anim_sys.c | 273 +++++++++------------------- 1 file changed, 84 insertions(+), 189 deletions(-) diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 894761218e0..7d44c61d516 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -3132,13 +3132,6 @@ void nlastrip_evaluate(PointerRNA *ptr, float bone_blend_matrix[4][4]; mul_m4_m4m4(bone_blend_matrix, rest_matrix_inv, world); mul_m4_m4m4(bone_blend_matrix, bone_blend_matrix, rest_matrix); - // copy_m4_m4(bone_blend_matrix, world); - // BKE_constraint_mat_convertspace(object, - // pose_channel, - // bone_blend_matrix, - // CONSTRAINT_SPACE_WORLD, - // CONSTRAINT_SPACE_LOCAL, - // false); char *location_path = BLI_sprintfN("pose.bones[\"%s\"].location", name_esc); NlaEvalChannel *location_channel = nlaevalchan_verify(ptr, channels, location_path); @@ -3172,29 +3165,6 @@ void nlastrip_evaluate(PointerRNA *ptr, switch (pose_channel->rotmode) { case ROT_MODE_QUAT: { - // todo:... large error for some reason here? Maybe its a separate IK issue? - // (seems fine with FK blends, but when I use the same animation with IK i get scealing - // issues.) - //...but I doi think there may be a memory leak caused by this patch? - - //..l.but when I use a non-NLA anim eval (full replace Action track) then everything - // works fine... - //..whats going on??? (nvm other strips ahd scale channels) - // --but seems to occur when strip with preblend xform doens't have the scale - // channels? After adding scale channels then it works fine? What if - // nlaeevalchan_verify() keeps the path str key and assumes it survived (this isn't it - // since not freeing memory doesnt solve it) - // -can't be verify() func since problem still exists if other strips have scale - // channels, thus it already exists. maybe its a depsgraph issue? There is no - // deps created for the blended scale channels despite it making changes-seems - // unliekly?-still, blend xforms should still work if strip itself doesn't have - // the channels. Notably, even if blend xform has scvale=2, then hips won't show - // up in properties as having 2.0 scale, which is weird..,and why is this not a - // problem for FK? (maybe the bake creates scale channels?) - // - // scale with be non-one afterward even if scale is one every where else... - // maybe it would be better to manually do scaling since its only affected by blend - // xform's scale? but would error lead to issues with rotation and location? normalize_qt(rotation_values); loc_quat_size_to_mat4( raw_snapshot_matrix, location_values, rotation_values, scale_values); @@ -3202,16 +3172,8 @@ void nlastrip_evaluate(PointerRNA *ptr, copy_v3_v3(location_values, raw_snapshot_matrix[3]); mat4_to_quat(rotation_values, raw_snapshot_matrix); - //*********** - //***IF SCALE NOT PART OF NLA DOMAIN, then it leads to serious scale errors? - // And the solution is literally to add scale channels in the dopesheet, then its 100% - // fine? - //...but why is this even a problem??!?!? - //...wait...if scale is not part of domain.. then why did it ever work in the viewport? - // at what point was it being written back to the bone???? - mat4_to_size(scale_values, raw_snapshot_matrix); //...why is this 1.0 as expected.. but - // blender shows .8 for scale??(hips) - // mat4_decompose(location_values, rotation_values, scale_values, raw_snapshot_matrix); + mat4_to_size(scale_values, raw_snapshot_matrix); + break; } case ROT_MODE_AXISANGLE: { @@ -3293,8 +3255,8 @@ void nlastrip_evaluate_invert_get_lower_values(PointerRNA *ptr, } /* Evaluates strip without blending, stored within snapshot. NLAEvalChannelSnapshot - * raw_value_sampled bits are set for channels sampled. This is only called by transition's - * invert function. */ + * raw_value_sampled bits are set for channels sampled. This is only called by transition's invert + * function. */ void nlastrip_evaluate_raw_value(PointerRNA *ptr, NlaEvalData *upper_eval_data, ListBase *modifiers, @@ -3326,9 +3288,9 @@ void nlastrip_evaluate_raw_value(PointerRNA *ptr, break; case NLASTRIP_TYPE_TRANSITION: /* - * If nes is eventually a transition, then nothing is written and no value bitmask is - * set. This matches the existing behavior that adjacent transitions evaluate to default - * (lower snapshot or property type default). + * If nes is eventually a transition, then nothing is written and no value bitmask is set. + * This matches the existing behavior that adjacent transitions evaluate to default (lower + * snapshot or property type default). * * In normal cases, this case should never happen. This is only called by * nlastrip_evaluate_transition_invert_get_lower_values() and transitions never reference @@ -3370,8 +3332,8 @@ void nladata_flush_channels(PointerRNA *ptr, LISTBASE_FOREACH (NlaEvalChannel *, nec, &channels->channels) { /** * The bitmask is set for all channels touched by NLA due to the domain() function. - * Channels touched by current set of evaluated strips will have a snapshot channel - * directly from the evaluation snapshot. + * Channels touched by current set of evaluated strips will have a snapshot channel directly + * from the evaluation snapshot. * * This function falls back to the default value if the snapshot channel doesn't exist. * Thus channels, touched by NLA but not by the current set of evaluated strips, will be @@ -3421,12 +3383,6 @@ static void nla_eval_domain_action(PointerRNA *ptr, NlaEvalChannel *nec = nlaevalchan_verify(ptr, channels, fcu->rna_path); - NlaEvalChannel *scale_channel = nlaevalchan_verify( - ptr, channels, "pose.bones[\"Hips\"].scale"); - if (nec == scale_channel) { - nec->is_array = scale_channel->is_array; - } - if (nec != NULL) { /* For quaternion properties, enable all sub-channels. */ if (nec->mix_mode == NEC_MIX_QUATERNION) { @@ -3580,9 +3536,8 @@ static void nonstrip_action_fill_strip_data(const AnimData *adt, * and this setting doesn't work. */ action_strip->flag |= NLASTRIP_FLAG_USR_INFLUENCE; - /* Unless extendmode is Nothing (might be useful for flattening NLA evaluation), disable - * range. Extendmode Nothing and Hold will behave as normal. Hold Forward will behave just - * like Hold. + /* Unless extendmode is Nothing (might be useful for flattening NLA evaluation), disable range. + * Extendmode Nothing and Hold will behave as normal. Hold Forward will behave just like Hold. */ if (action_strip->extendmode != NLASTRIP_EXTEND_NOTHING) { action_strip->flag |= NLASTRIP_FLAG_NO_TIME_MAP; @@ -3630,8 +3585,8 @@ bool is_nlatrack_evaluatable(const AnimData *adt, const NlaTrack *nlt) return true; } -/** Check for special case of non-pushed action being evaluated with no NLA influence (off and - * no strips evaluated) nor NLA interference (ensure NLA not soloing). */ +/** Check for special case of non-pushed action being evaluated with no NLA influence (off and no + * strips evaluated) nor NLA interference (ensure NLA not soloing). */ static bool is_nonstrip_action_evaluated_without_nla(const AnimData *adt, const bool any_strip_evaluated) { @@ -3645,12 +3600,11 @@ static bool is_nonstrip_action_evaluated_without_nla(const AnimData *adt, } /** XXX Wayde Moss: BKE_nlatrack_find_tweaked() exists within nla.c, but it doesn't appear to - * work as expected. From animsys_evaluate_nla_for_flush(), it returns NULL in tweak mode. I'm - * not sure why. Preferably, it would be as simple as checking for (adt->act_Track == nlt) but - * that doesn't work either, neither does comparing indices. + * work as expected. From animsys_evaluate_nla_for_flush(), it returns NULL in tweak mode. I'm not + * sure why. Preferably, it would be as simple as checking for (adt->act_Track == nlt) but that + * doesn't work either, neither does comparing indices. * - * This function is a temporary work around. The first disabled track is always the tweaked - * track. + * This function is a temporary work around. The first disabled track is always the tweaked track. */ static NlaTrack *nlatrack_find_tweaked(const AnimData *adt) { @@ -3728,58 +3682,6 @@ static bool animsys_evaluate_nla_for_flush(NlaEvalData *echannels, nonstrip_action_fill_strip_data(adt, &action_strip, false); nlastrips_ctime_get_strip_single(&estrips, &action_strip, anim_eval_context, flush_to_original); - /* - * create and group loc/rot/scale nla channels for blend bones - * -need to also calc blend xform in bone's local space (blend transform in world - (pose?) - * space, need it in bone local space) use convert_space? - * - * - * Q: how to get pchan_index from bone name? - bPoseChannel *BKE_pose_channel_find_name(const bPose *pose, const char *name) - bPoseChannel *pchan = pose_pchan_get_indexed(object, pchan_index); - - BKE_constraint_mat_convertspace(ob, pchan, (float(*)[4])mat_ret, from, to, false); - - * will also have to compute each strip into raw-value snapshots. - * - * before blending snapshot wtih lower, we apply blend transforms -use blend - * grouped data - * ______ - * - * Prep: - * 1) Get all strips that will evaluate on current frame. - * 2) Create and group specified bones' nla channels. This is used to conveniently get - channels to apply blend to. Grouped using hash: bonename to nlachannels (should blend - xform affect domain? should it xform as if bone has identity if no channels exist? for now - assuming trivial all TRS exist) - - * For each strip: - * 1) store fcurve raw values into a snapshot - * 2) - * 1) Convert World space blend xforms to each specified bone's local space - 2.5) hash? for bone name to bone's blend xform matrix? - * 4) Apply blend xforms to raw snapshot as a parent xform - * 5) apply nla blend - */ - /** - * todo: name escape bone names - * / - - // TODO: blend xform should be part of nalstrip_evaluate()? (so remap() and resample() - don't - // have to change anything) - // should eval and create raw snapshot per call, then blend as expected before finishing - GHash *nla_blend_from_bonename = BLI_ghash_str_new("blend_xform_from_bonename"); - - // PointerRNA id_ptr; - // RNA_id_pointer_create(prop_ptr->owner_id, &id_ptr); - - // NlaEvalChannel *nec = nlaevalchan_verify(&id_ptr, &upper_eval_data, rna_path); - - for (nes = estrips.first; nes; nes = nes->next) { - } - /* Per strip, evaluate and accumulate on top of existing channels. */ for (nes = estrips.first; nes; nes = nes->next) { nlastrip_evaluate(ptr, @@ -3797,8 +3699,8 @@ static bool animsys_evaluate_nla_for_flush(NlaEvalData *echannels, return true; } -/** Lower blended values are calculated and accumulated into r_context->lower_nla_channels. - * Upper NlaEvalStrips are stored in r_context->upper_estrips. */ +/** Lower blended values are calculated and accumulated into r_context->lower_nla_channels. Upper + * NlaEvalStrips are stored in r_context->upper_estrips. */ static void animsys_evaluate_nla_for_keyframing(NlaKeyframingContext *r_context, PointerRNA *ptr, const AnimData *adt, @@ -3879,8 +3781,7 @@ static void animsys_evaluate_nla_for_keyframing(NlaKeyframingContext *r_context, } /** Note: Although we early out, we can still keyframe to the non-pushed action since the - * keyframe remap function detects (adt->strip.act == NULL) and will keyframe without - * remapping. + * keyframe remap function detects (adt->strip.act == NULL) and will keyframe without remapping. */ if (is_nonstrip_action_evaluated_without_nla(adt, has_strips)) { BLI_freelistN(&lower_estrips); @@ -4107,14 +4008,13 @@ bool BKE_animsys_nla_remap_keyframe_values(struct NlaKeyframingContext *context, ListBase *upper_estrips = &context->upper_estrips; LISTBASE_FOREACH_BACKWARD (NlaEvalStrip *, nes, upper_estrips) { /** This will disable nec_snapshot->invertible bits if an upper strip is not invertible - * (full replace, multiply zero, or non-invertible transition). Then there is no - * inversion solution. */ + * (full replace, multiply zero, or non-invertible transition). Then there is no inversion + * solution. */ nlastrip_evaluate_invert_get_lower_values( &id_ptr, &upper_eval_data, NULL, nes, blended_values_snapshot, anim_eval_context); } - /* At this point, the snapshot contains the output values after the tweak strip is applied. - */ + /* At this point, the snapshot contains the output values after the tweak strip is applied. */ bool all_invertible = true; if (index == -1 || nec->mix_mode == NEC_MIX_QUATERNION) { for (int i = 0; i < count; i++) { @@ -4129,8 +4029,7 @@ bool BKE_animsys_nla_remap_keyframe_values(struct NlaKeyframingContext *context, nlaeval_free(&upper_eval_data); - /** To match existing implementation, only succeeds if all desired indices are invertible. - */ + /** To match existing implementation, only succeeds if all desired indices are invertible. */ if (!all_invertible) { return false; } @@ -4252,8 +4151,8 @@ void nlastrip_append_actionclip_recursive(ListBase *dst, NlaStrip *strip) } /** Mute selected NLA strips and resample into a new track. The final Nla stack result will be - * preserved when possible. New resampled strip will be selected. Previously selected strips - * will be muted and deselected afterward. + * preserved when possible. New resampled strip will be selected. Previously selected strips will + * be muted and deselected afterward. * * \param resample_blendmode: Resulting resampled strip's blend mode. * \param resample_influence: Resulting resampled strip's influence. above. @@ -4278,8 +4177,8 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main, * * Merge Strips: User selects a block of NlaStrips and Resamples. * - * Convert Strips: User selects a single NlaStrip and Resamples with a different blendmode - * and/or influence. + * Convert Strips: User selects a single NlaStrip and Resamples with a different blendmode and/or + * influence. * * ********************* Potential improvements/changes ********************************* * @@ -4289,18 +4188,18 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main, * done by the caller. * * Allow user to somehow select channels to be resampled. Currently all channels found in all - * selected strips are resampled. Though a simple work around is to delete the undesired - * channels after the resample. + * selected strips are resampled. Though a simple work around is to delete the undesired channels + * after the resample. * * ********************* Limitations and potential problems ***************************** * - * Design: When resample strip value not valid, what should we do? Currently we write a - * default value. Nothing we write will preserve the animation. This leaves the problem as a - * "Known Issue". + * Design: When resample strip value not valid, what should we do? Currently we write a default + * value. Nothing we write will preserve the animation. This leaves the problem as a "Known + * Issue". * - * This function will not properly resample outside of the resample bounds. Generally, it's - * not possible since multiple strips with non-None extend modes can not be represented by a - * single strip of any extend mode.. Maybe it's possible by properly setting the pre and post + * This function will not properly resample outside of the resample bounds. Generally, it's not + * possible since multiple strips with non-None extend modes can not be represented by a single + * strip of any extend mode.. Maybe it's possible by properly setting the pre and post * extrapolation for individual fcurves? */ @@ -4322,16 +4221,15 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main, * whole_snapshot: Evaluate the whole NLA stack. Selected strips are included since we're * preserving this snapshot result. * - * lower_snapshot: Evaluate the NLA stack from the base track up to the resample track, - * excluding selected tracks and the resampled track. + * lower_snapshot: Evaluate the NLA stack from the base track up to the resample track, excluding + * selected tracks and the resampled track. * - * upper_strips: The strips from the resampled strip, exclusive, to the topmost track, - * excluding selected strips. + * upper_strips: The strips from the resampled strip, exclusive, to the topmost track, excluding + * selected strips. * - * With these three sets of data, we can solve for the value that resample strip must - * evaluate to that satisfies whole_snapshot when the selected strips are muted. It's the - * same way keyframe remapping works where the tweak strip is substituted with the resample - * strip. + * With these three sets of data, we can solve for the value that resample strip must evaluate + * to that satisfies whole_snapshot when the selected strips are muted. It's the same way + * keyframe remapping works where the tweak strip is substituted with the resample strip. */ BLI_assert(!ELEM(NULL, main, depsgraph, adt, id_ptr)); @@ -4397,11 +4295,10 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main, return NULL; } - /********* (Earlier than used) Create NlaEvalData, NlaEvalSnapshots, bActionGroup hashes. - * *****/ - /** NOTE: We obtain the following data this early to prevent allocating the resample track - * and strip prematurely. It's mostly out of preference. Otherwise, this block can be placed - * right before calculating the resample keyframe values. */ + /********* (Earlier than used) Create NlaEvalData, NlaEvalSnapshots, bActionGroup hashes. *****/ + /** NOTE: We obtain the following data this early to prevent allocating the resample track and + * strip prematurely. It's mostly out of preference. Otherwise, this block can be placed right + * before calculating the resample keyframe values. */ NlaEvalData eval_data_buffer; NlaEvalData *eval_data = &eval_data_buffer; @@ -4422,17 +4319,17 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main, /** Visit all the involved fcurves. An fcurve pair (rna_path, array_index) may be visited * multiple times. * - * Allocate all the necessary NlaEvalChannels and NlaEvalChannelSnapshots. This is the only - *time we allow new NlaEvalChannels and snapshots to be allocated. + * Allocate all the necessary NlaEvalChannels and NlaEvalChannelSnapshots. This is the only time + * we allow new NlaEvalChannels and snapshots to be allocated. * * NlaEvalChannel->domain bitmap will be used to store whether the fcurve channel exists * among the selected strips. Effectively it marks whether the fcurve is involved in the - * resample. For Quaternions, all 4 fcurves are marked as involved if any exists. Later, we - *only allocate enough memory to store resample values for involved fcurves. + * resample. For Quaternions, all 4 fcurves are marked as involved if any exists. Later, we only + * allocate enough memory to store resample values for involved fcurves. * - * We use hashes to preserve fcurve groups. For NlaEvalChannels, we assume that not all - *elements may be in the same bActionGroup. It's an unlikely case but still possible. For now - *we just store the original bActionGroup and later we'll duplicate it. + * We use hashes to preserve fcurve groups. For NlaEvalChannels, we assume that not all elements + * may be in the same bActionGroup. It's an unlikely case but still possible. For now we just + * store the original bActionGroup and later we'll duplicate it. **/ LISTBASE_FOREACH (LinkData *, link_data, &selected_strips) { NlaStrip *outter_strip = link_data->data; @@ -4490,8 +4387,8 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main, /** Count the total number of fcurves involve in the resample. * - * We have to do this separately from the above loop because the above will visit the same - * fcurve (rna_path, array_index) pair multiple times. */ + * We have to do this separately from the above loop because the above will visit the same fcurve + * (rna_path, array_index) pair multiple times. */ int total_fcurves = 0; LISTBASE_FOREACH (NlaEvalChannel *, nec, &eval_data->channels) { for (int array_index = 0; array_index < nec->base_snapshot.length; array_index++) { @@ -4580,10 +4477,10 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main, /************** 4) Calculate resample keyframes. ***************************** */ - /** Instead of calculating the resample strip value and creating a keyframe (and fcurve) for - * it per iteration, we create a buffer of all the resample values and create the keyframes - * after the resampling completes. This is partly for optimization and partly to simplify the - * code involved in the loop. + /** Instead of calculating the resample strip value and creating a keyframe (and fcurve) for it + * per iteration, we create a buffer of all the resample values and create the keyframes after + * the resampling completes. This is partly for optimization and partly to simplify the code + * involved in the loop. * * Memory layout: * @@ -4595,9 +4492,9 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main, * } * } * - * So we store all the keyframe co values for an fcurve as a single contiguous block. That - * way we can create the fcurve and sequentially write all of its co values in one go. For - * our current implementation, each write is offsetted by total_frames amount of floats. A + * So we store all the keyframe co values for an fcurve as a single contiguous block. That way + * we can create the fcurve and sequentially write all of its co values in one go. For our + * current implementation, each write is offsetted by total_frames amount of floats. A * potential efficiency improvement would be to calculate the eval data in the same order and * optimizing the eval calculation for single channels (4 channels for quaternions). */ @@ -4621,8 +4518,8 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main, nonstrip_action_fill_strip_data(adt, &action_strip, false); /** XXX: Proceeding code assumes no NlaEvalChannel/Snapshot ever created or deleted. Doing so - * is unexpected and will lead to a crash since resample_values_buffer is not allocated for - * non resampled channels. + * is unexpected and will lead to a crash since resample_values_buffer is not allocated for non + * resampled channels. * * The only allocated data per frame are NlaEvalStrips into upper_estrips and lower_estrips, * freed per iteration. A more optimal solution is noted inside at the end of the loop. */ @@ -4691,9 +4588,9 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main, /** Calculate lower_eval_data. Exclude selected strips. * - * Optimization: If resample strip is full REPLACE, then lower strips not needed to solve - * for resample result. This works because resample strip will replace every channel in - * the lower strips. */ + * Optimization: If resample strip is full REPLACE, then lower strips not needed to solve for + * resample result. This works because resample strip will replace every channel in the lower + * strips. */ if (!full_replace) { for (NlaEvalStrip *nes = lower_estrips.first; nes; nes = nes->next) { if ((nes->strip->flag & NLASTRIP_FLAG_SELECT) == 0) { @@ -4721,9 +4618,9 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main, */ LISTBASE_FOREACH_BACKWARD (NlaEvalStrip *, nes, &upper_estrips) { if ((nes->strip->flag & NLASTRIP_FLAG_SELECT) == 0) { - /** This will disable nec_snapshot->invertible bits if an upper strip is not - * invertible (full replace, multiply zero, or non-invertible transition). Then there - * is no inversion solution. */ + /** This will disable nec_snapshot->invertible bits if an upper strip is not invertible + * (full replace, multiply zero, or non-invertible transition). Then there is no + * inversion solution. */ nlastrip_evaluate_invert_get_lower_values( id_ptr, eval_data, NULL, nes, whole_snapshot, &cfra_context); } @@ -4895,10 +4792,10 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main, BezTriple *beztr = (fcurve->bezt + index_cfra); beztr->h1 = beztr->h2 = HD_AUTO_ANIM; beztr->ipo = BEZT_IPO_BEZ; - /** TODO: What's convention for creating macros? Should I take it out of - * ED_anim_api.h and put it in here? What about things that rely on the same file for - * that define? Should I recreate the define in this file? Seems worst to copy what - * Macro does, but I can ask that question in the patch. + /** TODO: What's convention for creating macros? Should I take it out of ED_anim_api.h + * and put it in here? What about things that rely on the same file for that define? + * Should I recreate the define in this file? Seems worst to copy what Macro does, but + * I can ask that question in the patch. */ // BEZKEYTYPE(&beztr) = keyframe_type; beztr->hide = BEZT_KEYTYPE_KEYFRAME; @@ -4998,21 +4895,19 @@ static void animsys_evaluate_overrides(PointerRNA *ptr, AnimData *adt) * --------------< always executed >------------------ * * Maintenance of editability of settings (XXX): - * - In order to ensure that settings that are animated can still be manipulated in the UI - * without requiring that keyframes are added to prevent these values from being overwritten, + * - In order to ensure that settings that are animated can still be manipulated in the UI without + * requiring that keyframes are added to prevent these values from being overwritten, * we use 'overrides'. * * Unresolved things: * - Handling of multi-user settings (i.e. time-offset, group-instancing) -> big cache grids * or nodal system? but stored where? * - Multiple-block dependencies - * (i.e. drivers for settings are in both local and higher levels) -> split into separate - * lists? + * (i.e. drivers for settings are in both local and higher levels) -> split into separate lists? * * Current Status: - * - Currently (as of September 2009), overrides we haven't needed to (fully) implement - * overrides. However, the code for this is relatively harmless, so is left in the code for - * now. + * - Currently (as of September 2009), overrides we haven't needed to (fully) implement overrides. + * However, the code for this is relatively harmless, so is left in the code for now. */ /* Evaluation loop for evaluation animation data @@ -5133,8 +5028,8 @@ void BKE_animsys_evaluate_all_animation(Main *main, Depsgraph *depsgraph, float * which should ultimately be empty, since it is not possible for now to have any animation * without some actions, and drivers wouldn't get affected by any state changes * - * however, if there are some curves, we will need to make sure that their 'ctime' property - * gets set correctly, so this optimization must be skipped in that case... + * however, if there are some curves, we will need to make sure that their 'ctime' property gets + * set correctly, so this optimization must be skipped in that case... */ if (BLI_listbase_is_empty(&main->actions) && BLI_listbase_is_empty(&main->curves)) { if (G.debug & G_DEBUG) { @@ -5297,8 +5192,8 @@ void BKE_animsys_eval_driver(Depsgraph *depsgraph, ID *id, int driver_index, FCu ChannelDriver *driver_orig = fcu_orig->driver; if ((driver_orig) && !(driver_orig->flag & DRIVER_FLAG_INVALID)) { /* evaluate this using values set already in other places - * NOTE: for 'layering' option later on, we should check if we should remove old value - * before adding new to only be done when drivers only changed */ + * NOTE: for 'layering' option later on, we should check if we should remove old value before + * adding new to only be done when drivers only changed */ // printf("\told val = %f\n", fcu->curval); PathResolvedRNA anim_rna; -- cgit v1.2.3