From adcce654e38307b180ebdfa3699a80018ac95f63 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 18 Apr 2022 20:17:41 -0400 Subject: Cleanup: Use correct capitalization of "F-Curve" --- doc/python_api/rst/info_gotcha.rst | 4 ++-- source/blender/blenkernel/BKE_fcurve.h | 2 +- source/blender/blenkernel/intern/action_mirror.c | 24 +++++++++++----------- source/blender/blenkernel/intern/armature.c | 2 +- source/blender/blenkernel/intern/curve.cc | 2 +- source/blender/blenkernel/intern/fcurve_cache.c | 2 +- .../blender/blenkernel/intern/tracking_stabilize.c | 2 +- .../editors/animation/anim_channels_defines.c | 2 +- .../editors/space_sequencer/sequencer_draw.c | 2 +- .../editors/transform/transform_convert_action.c | 2 +- source/blender/io/collada/AnimationImporter.cpp | 2 +- source/blender/makesdna/DNA_space_types.h | 2 +- source/blender/makesrna/intern/rna_userdef.c | 2 +- source/blender/sequencer/SEQ_animation.h | 6 +++--- source/blender/sequencer/intern/strip_edit.c | 2 +- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/doc/python_api/rst/info_gotcha.rst b/doc/python_api/rst/info_gotcha.rst index bef76a5e479..d3067eb0518 100644 --- a/doc/python_api/rst/info_gotcha.rst +++ b/doc/python_api/rst/info_gotcha.rst @@ -93,7 +93,7 @@ Consider the calculations that might contribute to the object's final transforma - Animation function curves. - Drivers and their Python expressions. - Constraints -- Parent objects and all of their F-curves, constraints, etc. +- Parent objects and all of their F-Curves, constraints, etc. To avoid expensive recalculations every time a property is modified, Blender defers the evaluation until the results are needed. @@ -802,7 +802,7 @@ Removing Data ------------- **Any** data that you remove shouldn't be modified or accessed afterwards, -this includes: F-curves, drivers, render layers, timeline markers, modifiers, constraints +this includes: F-Curves, drivers, render layers, timeline markers, modifiers, constraints along with objects, scenes, collections, bones, etc. The ``remove()`` API calls will invalidate the data they free to prevent common mistakes. diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h index 382bfd5b7db..6784a1296e9 100644 --- a/source/blender/blenkernel/BKE_fcurve.h +++ b/source/blender/blenkernel/BKE_fcurve.h @@ -264,7 +264,7 @@ struct FCurve *id_data_find_fcurve( ID *id, void *data, struct StructRNA *type, const char *prop_name, int index, bool *r_driven); /** - * Get list of LinkData's containing pointers to the F-curves + * Get list of LinkData's containing pointers to the F-Curves * which control the types of data indicated. * e.g. `numMatches = BKE_fcurves_filter(matches, &act->curves, "pose.bones[", "MyFancyBone");` * diff --git a/source/blender/blenkernel/intern/action_mirror.c b/source/blender/blenkernel/intern/action_mirror.c index bb988605923..7ef561c8216 100644 --- a/source/blender/blenkernel/intern/action_mirror.c +++ b/source/blender/blenkernel/intern/action_mirror.c @@ -37,21 +37,21 @@ * That could be useful if a user for example only has 2x rotation channels set. * In practice users typically keyframe all rotation channels or none. * - * - F-curve modifiers are disabled for evaluation, + * - F-Curve modifiers are disabled for evaluation, * so the values written back to the keyframes don't include modifier offsets. * * - Sub-frame key-frames aren't supported, * this could be added if needed without much trouble. * - * - F-curves must have a #FCurve.bezt array (sampled curves aren't supported). + * - F-Curves must have a #FCurve.bezt array (sampled curves aren't supported). * \{ */ /** - * This structure is created for each pose channels F-curve, + * This structure is created for each pose channels F-Curve, * an action be evaluated and stored in `fcurve_eval`, * with the mirrored values written into `bezt_array`. * - * Store F-curve evaluated values, constructed with a sorted array of rounded keyed-frames, + * Store F-Curve evaluated values, constructed with a sorted array of rounded keyed-frames, * passed to #action_flip_pchan_cache_init. */ struct FCurve_KeyCache { @@ -60,7 +60,7 @@ struct FCurve_KeyCache { */ FCurve *fcurve; /** - * Cached evaluated F-curve values (without modifiers). + * Cached evaluated F-Curve values (without modifiers). */ float *fcurve_eval; /** @@ -117,7 +117,7 @@ static void action_flip_pchan_cache_init(struct FCurve_KeyCache *fkc, { BLI_assert(fkc->fcurve != NULL); - /* Cache the F-curve values for `keyed_frames`. */ + /* Cache the F-Curve values for `keyed_frames`. */ const int fcurve_flag = fkc->fcurve->flag; fkc->fcurve->flag |= FCURVE_MOD_OFF; fkc->fcurve_eval = MEM_mallocN(sizeof(float) * keyed_frames_len, __func__); @@ -175,7 +175,7 @@ static void action_flip_pchan(Object *ob_arm, * unavailable channels are left NULL. */ /** - * Structure to store transformation F-curves corresponding to a pose bones transformation. + * Structure to store transformation F-Curves corresponding to a pose bones transformation. * Match struct member names from #bPoseChannel so macros avoid repetition. * * \note There is no need to read values unless they influence the 4x4 transform matrix, @@ -210,7 +210,7 @@ static void action_flip_pchan(Object *ob_arm, #undef FCURVE_ASSIGN_VALUE #undef FCURVE_ASSIGN_ARRAY - /* Array of F-curves, for convenient access. */ + /* Array of F-Curves, for convenient access. */ #define FCURVE_CHANNEL_LEN (sizeof(fkc_pchan) / sizeof(struct FCurve_KeyCache)) FCurve *fcurve_array[FCURVE_CHANNEL_LEN]; int fcurve_array_len = 0; @@ -232,7 +232,7 @@ static void action_flip_pchan(Object *ob_arm, const float *keyed_frames = BKE_fcurves_calc_keyed_frames( fcurve_array, fcurve_array_len, &keyed_frames_len); - /* Initialize the pose channel curve cache from the F-curve. */ + /* Initialize the pose channel curve cache from the F-Curve. */ for (int chan = 0; chan < FCURVE_CHANNEL_LEN; chan++) { struct FCurve_KeyCache *fkc = (struct FCurve_KeyCache *)(&fkc_pchan) + chan; if (fkc->fcurve == NULL) { @@ -256,7 +256,7 @@ static void action_flip_pchan(Object *ob_arm, float arm_mat_inv[4][4]; invert_m4_m4(arm_mat_inv, pchan_flip ? pchan_flip->bone->arm_mat : pchan->bone->arm_mat); - /* Now flip the transformation & write it back to the F-curves in `fkc_pchan`. */ + /* Now flip the transformation & write it back to the F-Curves in `fkc_pchan`. */ for (int frame_index = 0; frame_index < keyed_frames_len; frame_index++) { @@ -329,7 +329,7 @@ static void action_flip_pchan(Object *ob_arm, BKE_pchan_apply_mat4(&pchan_temp, chan_mat, false); - /* Write the values back to the F-curves. */ + /* Write the values back to the F-Curves. */ #define WRITE_VALUE_FLT(id) \ if (fkc_pchan.id.fcurve_eval != NULL) { \ BezTriple *bezt = fkc_pchan.id.bezt_array[frame_index]; \ @@ -348,7 +348,7 @@ static void action_flip_pchan(Object *ob_arm, } \ ((void)0) - /* Write the values back the F-curves. */ + /* Write the values back the F-Curves. */ WRITE_ARRAY_FLT(loc); WRITE_ARRAY_FLT(eul); WRITE_ARRAY_FLT(quat); diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 0a6ef8f0f01..0ed322d386c 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -2480,7 +2480,7 @@ void BKE_pose_where_is_bone(struct Depsgraph *depsgraph, float ctime, bool do_extra) { - /* This gives a chan_mat with actions (F-curve) results. */ + /* This gives a chan_mat with actions (F-Curve) results. */ if (do_extra) { BKE_pchan_calc_mat(pchan); } diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc index 6815b4d7486..bad70d4ccc6 100644 --- a/source/blender/blenkernel/intern/curve.cc +++ b/source/blender/blenkernel/intern/curve.cc @@ -3182,7 +3182,7 @@ static void calchandleNurb_intern(BezTriple *bezt, len *= 2.5614f; if (len != 0.0f) { - /* Only for F-curves. */ + /* Only for F-Curves. */ bool leftviolate = false, rightviolate = false; if (!is_fcurve || fcurve_smoothing == FCURVE_SMOOTH_NONE) { diff --git a/source/blender/blenkernel/intern/fcurve_cache.c b/source/blender/blenkernel/intern/fcurve_cache.c index d67a0ad0e1b..e3b9c4aa10b 100644 --- a/source/blender/blenkernel/intern/fcurve_cache.c +++ b/source/blender/blenkernel/intern/fcurve_cache.c @@ -71,7 +71,7 @@ struct FCurvePathCache *BKE_fcurve_pathcache_create(ListBase *list) } qsort(fcurve_array, fcurve_array_len, sizeof(FCurve *), fcurve_cmp_for_cache); - /* Allow for the case no F-curves share an RNA-path, otherwise this is over-allocated. + /* Allow for the case no F-Curves share an RNA-path, otherwise this is over-allocated. * Although in practice it's likely to only be 3-4x as large as is needed * (with transform channels for e.g.). */ struct FCurvePathCache_Span *span_table = MEM_mallocN(sizeof(*span_table) * fcurve_array_len, diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c index 882f7b87597..d86a0c10f01 100644 --- a/source/blender/blenkernel/intern/tracking_stabilize.c +++ b/source/blender/blenkernel/intern/tracking_stabilize.c @@ -198,7 +198,7 @@ static void use_values_from_fcurves(StabContext *ctx, bool toggle) } /* Prepare per call private working area. - * Used for access to possibly animated values: retrieve available F-curves. + * Used for access to possibly animated values: retrieve available F-Curves. */ static StabContext *init_stabilization_working_context(MovieClip *clip) { diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index eb7f8e8ad83..9722de0ce3c 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -5187,7 +5187,7 @@ void ANIM_channel_draw_widgets(const bContext *C, } /* Visibility toggle. */ if (acf->has_setting(ac, ale, ACHANNEL_SETTING_VISIBLE)) { - /* For F-curves, add the extra space for the color bands. */ + /* For F-Curves, add the extra space for the color bands. */ if (ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE)) { offset += GRAPH_ICON_VISIBILITY_OFFSET; } diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 31e885d16f2..1c1694479d3 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -383,7 +383,7 @@ static void draw_seq_waveform_overlay(View2D *v2d, return; } - /* F-curve lookup is quite expensive, so do this after precondition. */ + /* F-Curve lookup is quite expensive, so do this after precondition. */ FCurve *fcu = id_data_find_fcurve(&scene->id, seq, &RNA_Sequence, "volume", 0, NULL); WaveVizData *tri_strip_arr = MEM_callocN(sizeof(*tri_strip_arr) * pix_strip_len * 2, diff --git a/source/blender/editors/transform/transform_convert_action.c b/source/blender/editors/transform/transform_convert_action.c index ac1e961e361..71c245cd512 100644 --- a/source/blender/editors/transform/transform_convert_action.c +++ b/source/blender/editors/transform/transform_convert_action.c @@ -337,7 +337,7 @@ void createTransActionData(bContext *C, TransInfo *t) t->frame_side = 'B'; } - /* loop 1: fully select F-curve keys and count how many BezTriples are selected */ + /* loop 1: fully select F-Curve keys and count how many BezTriples are selected */ for (ale = anim_data.first; ale; ale = ale->next) { AnimData *adt = ANIM_nla_mapping_get(&ac, ale); int adt_count = 0; diff --git a/source/blender/io/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp index 8f5d2742b0e..923a392dbde 100644 --- a/source/blender/io/collada/AnimationImporter.cpp +++ b/source/blender/io/collada/AnimationImporter.cpp @@ -1059,7 +1059,7 @@ void AnimationImporter::translate_Animations( apply_matrix_curves(ob, animcurves, root, node, transform); } else { - /* Calculate RNA-paths and array index of F-curves according to transformation and + /* Calculate RNA-paths and array index of F-Curves according to transformation and * animation class */ Assign_transform_animations(transform, &bindings[j], &animcurves, is_joint, joint_path); diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 838213dd2f3..8d527caa361 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -517,7 +517,7 @@ typedef enum eGraphEdit_Mode { typedef enum eGraphEdit_Runtime_Flag { /** Temporary flag to force channel selections to be synced with main. */ SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC = (1 << 0), - /** Temporary flag to force F-curves to recalculate colors. */ + /** Temporary flag to force F-Curves to recalculate colors. */ SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC_COLOR = (1 << 1), /** diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 8c86e44aebf..5ddc8e97e45 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -5256,7 +5256,7 @@ static void rna_def_userdef_edit(BlenderRNA *brna) prop = RNA_def_property(srna, "use_duplicate_fcurve", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_FCURVE); RNA_def_property_ui_text( - prop, "Duplicate F-Curve", "Causes F-curve data to be duplicated with the object"); + prop, "Duplicate F-Curve", "Causes F-Curve data to be duplicated with the object"); # endif prop = RNA_def_property(srna, "use_duplicate_action", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/sequencer/SEQ_animation.h b/source/blender/sequencer/SEQ_animation.h index f2c66393b65..b8f74e5a510 100644 --- a/source/blender/sequencer/SEQ_animation.h +++ b/source/blender/sequencer/SEQ_animation.h @@ -20,15 +20,15 @@ void SEQ_free_animdata(struct Scene *scene, struct Sequence *seq); void SEQ_offset_animdata(struct Scene *scene, struct Sequence *seq, int ofs); struct GSet *SEQ_fcurves_by_strip_get(const struct Sequence *seq, struct ListBase *fcurve_base); /** - * Move all `F-curves` from `scene` to `list`. + * Move all `F-Curves` from `scene` to `list`. */ void SEQ_animation_backup_original(struct Scene *scene, struct ListBase *list); /** - * Move all `F-curves` from `list` to `scene`. + * Move all `F-Curves` from `list` to `scene`. */ void SEQ_animation_restore_original(struct Scene *scene, struct ListBase *list); /** - * Duplicate `F-curves` used by `seq` from `list` to `scene`. + * Duplicate `F-Curves` used by `seq` from `list` to `scene`. */ void SEQ_animation_duplicate(struct Scene *scene, struct Sequence *seq, struct ListBase *list); diff --git a/source/blender/sequencer/intern/strip_edit.c b/source/blender/sequencer/intern/strip_edit.c index d678518e3b0..7aa81f5ae8a 100644 --- a/source/blender/sequencer/intern/strip_edit.c +++ b/source/blender/sequencer/intern/strip_edit.c @@ -461,7 +461,7 @@ Sequence *SEQ_edit_strip_split(Main *bmain, return NULL; } - /* Store `F-curves`, so original ones aren't renamed. */ + /* Store `F-Curves`, so original ones aren't renamed. */ ListBase fcurves_original_backup = {NULL, NULL}; SEQ_animation_backup_original(scene, &fcurves_original_backup); -- cgit v1.2.3