From 7bf8d8b3c89cfda3245c1e36e03279c1c970740b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 May 2019 16:17:15 +1000 Subject: Cleanup: use time scrub instead of scrubbing Renaming was only done to ED_time_scrub_ui.h, function names and struct members used term 'scrubbing' which is ambiguous. --- source/blender/makesdna/DNA_userdef_types.h | 2 +- source/blender/makesdna/intern/dna_rename_defs.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 9cab63dbfeb..fa12de56364 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -283,7 +283,7 @@ typedef struct ThemeSpace { char cframe[4]; char time_keyframe[4], time_gp_keyframe[4]; char freestyle_edge_mark[4], freestyle_face_mark[4]; - char scrubbing_background[4]; + char time_scrub_background[4]; char _pad5[4]; char nurb_uline[4], nurb_vline[4]; diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h index 3aa0ff4b28a..0bc35c15e35 100644 --- a/source/blender/makesdna/intern/dna_rename_defs.h +++ b/source/blender/makesdna/intern/dna_rename_defs.h @@ -75,6 +75,7 @@ DNA_STRUCT_RENAME_ELEM(Object, size, scale) DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_group, instance_collection) DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_ob, instance_object) DNA_STRUCT_RENAME_ELEM(ParticleSettings, dupliweights, instance_weights) +DNA_STRUCT_RENAME_ELEM(ThemeSpace, scrubbing_background, time_scrub_background) DNA_STRUCT_RENAME_ELEM(View3D, far, clip_end) DNA_STRUCT_RENAME_ELEM(View3D, near, clip_start) DNA_STRUCT_RENAME_ELEM(bPoseChannel, curveInX, curve_in_x) -- cgit v1.2.3