diff --git a/scripts/startup/bl_ui/space_sequencer.py b/scripts/startup/bl_ui/space_sequencer.py index dfc84447681..d8731520261 100644 --- a/scripts/startup/bl_ui/space_sequencer.py +++ b/scripts/startup/bl_ui/space_sequencer.py @@ -1406,7 +1406,7 @@ class SEQUENCER_PT_color_tag_picker(SequencerColorTagPicker, Panel): row = layout.row(align=True) row.operator("sequencer.strip_color_tag_set", icon='X').color = 'NONE' for i in range(1, 10): - icon = 'SEQUENCE_COLOR_{:02d}'.format(i) + icon = 'STRIP_COLOR_{:02d}'.format(i) row.operator("sequencer.strip_color_tag_set", icon=icon).color = 'COLOR_{:02d}'.format(i) diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc index eaa84e61e07..7040a2faab8 100644 --- a/source/blender/blenloader/intern/versioning_300.cc +++ b/source/blender/blenloader/intern/versioning_300.cc @@ -492,7 +492,7 @@ static void do_versions_sequencer_speed_effect_recursive(Scene *scene, const Lis static bool do_versions_sequencer_color_tags(Strip *strip, void * /*user_data*/) { - strip->color_tag = SEQUENCE_COLOR_NONE; + strip->color_tag = STRIP_COLOR_NONE; return true; } @@ -3088,7 +3088,7 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain) } } - /* Set strip color tags to SEQUENCE_COLOR_NONE. */ + /* Set strip color tags to STRIP_COLOR_NONE. */ LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { if (scene->ed != nullptr) { SEQ_for_each_callback(&scene->ed->seqbase, do_versions_sequencer_color_tags, nullptr); diff --git a/source/blender/editors/include/UI_icons.hh b/source/blender/editors/include/UI_icons.hh index 763c4b95fd6..62a98646d03 100644 --- a/source/blender/editors/include/UI_icons.hh +++ b/source/blender/editors/include/UI_icons.hh @@ -904,15 +904,15 @@ DEF_ICON_VECTOR(COLLECTION_COLOR_06) DEF_ICON_VECTOR(COLLECTION_COLOR_07) DEF_ICON_VECTOR(COLLECTION_COLOR_08) -DEF_ICON_VECTOR(SEQUENCE_COLOR_01) -DEF_ICON_VECTOR(SEQUENCE_COLOR_02) -DEF_ICON_VECTOR(SEQUENCE_COLOR_03) -DEF_ICON_VECTOR(SEQUENCE_COLOR_04) -DEF_ICON_VECTOR(SEQUENCE_COLOR_05) -DEF_ICON_VECTOR(SEQUENCE_COLOR_06) -DEF_ICON_VECTOR(SEQUENCE_COLOR_07) -DEF_ICON_VECTOR(SEQUENCE_COLOR_08) -DEF_ICON_VECTOR(SEQUENCE_COLOR_09) +DEF_ICON_VECTOR(STRIP_COLOR_01) +DEF_ICON_VECTOR(STRIP_COLOR_02) +DEF_ICON_VECTOR(STRIP_COLOR_03) +DEF_ICON_VECTOR(STRIP_COLOR_04) +DEF_ICON_VECTOR(STRIP_COLOR_05) +DEF_ICON_VECTOR(STRIP_COLOR_06) +DEF_ICON_VECTOR(STRIP_COLOR_07) +DEF_ICON_VECTOR(STRIP_COLOR_08) +DEF_ICON_VECTOR(STRIP_COLOR_09) DEF_ICON_VECTOR(LIBRARY_DATA_INDIRECT) DEF_ICON_VECTOR(LIBRARY_DATA_OVERRIDE_NONEDITABLE) diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc index 9005f3240b9..b27006dd45e 100644 --- a/source/blender/editors/interface/interface_icons.cc +++ b/source/blender/editors/interface/interface_icons.cc @@ -436,15 +436,15 @@ static void vicon_strip_color_draw( vicon_strip_color_draw(color, x, y, w, h, alpha); \ } -DEF_ICON_STRIP_COLOR_DRAW(01, SEQUENCE_COLOR_01); -DEF_ICON_STRIP_COLOR_DRAW(02, SEQUENCE_COLOR_02); -DEF_ICON_STRIP_COLOR_DRAW(03, SEQUENCE_COLOR_03); -DEF_ICON_STRIP_COLOR_DRAW(04, SEQUENCE_COLOR_04); -DEF_ICON_STRIP_COLOR_DRAW(05, SEQUENCE_COLOR_05); -DEF_ICON_STRIP_COLOR_DRAW(06, SEQUENCE_COLOR_06); -DEF_ICON_STRIP_COLOR_DRAW(07, SEQUENCE_COLOR_07); -DEF_ICON_STRIP_COLOR_DRAW(08, SEQUENCE_COLOR_08); -DEF_ICON_STRIP_COLOR_DRAW(09, SEQUENCE_COLOR_09); +DEF_ICON_STRIP_COLOR_DRAW(01, STRIP_COLOR_01); +DEF_ICON_STRIP_COLOR_DRAW(02, STRIP_COLOR_02); +DEF_ICON_STRIP_COLOR_DRAW(03, STRIP_COLOR_03); +DEF_ICON_STRIP_COLOR_DRAW(04, STRIP_COLOR_04); +DEF_ICON_STRIP_COLOR_DRAW(05, STRIP_COLOR_05); +DEF_ICON_STRIP_COLOR_DRAW(06, STRIP_COLOR_06); +DEF_ICON_STRIP_COLOR_DRAW(07, STRIP_COLOR_07); +DEF_ICON_STRIP_COLOR_DRAW(08, STRIP_COLOR_08); +DEF_ICON_STRIP_COLOR_DRAW(09, STRIP_COLOR_09); # undef DEF_ICON_STRIP_COLOR_DRAW @@ -861,15 +861,15 @@ static void init_internal_icons() def_internal_vicon(ICON_COLLECTION_COLOR_07, vicon_collection_color_draw_07); def_internal_vicon(ICON_COLLECTION_COLOR_08, vicon_collection_color_draw_08); - def_internal_vicon(ICON_SEQUENCE_COLOR_01, vicon_strip_color_draw_01); - def_internal_vicon(ICON_SEQUENCE_COLOR_02, vicon_strip_color_draw_02); - def_internal_vicon(ICON_SEQUENCE_COLOR_03, vicon_strip_color_draw_03); - def_internal_vicon(ICON_SEQUENCE_COLOR_04, vicon_strip_color_draw_04); - def_internal_vicon(ICON_SEQUENCE_COLOR_05, vicon_strip_color_draw_05); - def_internal_vicon(ICON_SEQUENCE_COLOR_06, vicon_strip_color_draw_06); - def_internal_vicon(ICON_SEQUENCE_COLOR_07, vicon_strip_color_draw_07); - def_internal_vicon(ICON_SEQUENCE_COLOR_08, vicon_strip_color_draw_08); - def_internal_vicon(ICON_SEQUENCE_COLOR_09, vicon_strip_color_draw_09); + def_internal_vicon(ICON_STRIP_COLOR_01, vicon_strip_color_draw_01); + def_internal_vicon(ICON_STRIP_COLOR_02, vicon_strip_color_draw_02); + def_internal_vicon(ICON_STRIP_COLOR_03, vicon_strip_color_draw_03); + def_internal_vicon(ICON_STRIP_COLOR_04, vicon_strip_color_draw_04); + def_internal_vicon(ICON_STRIP_COLOR_05, vicon_strip_color_draw_05); + def_internal_vicon(ICON_STRIP_COLOR_06, vicon_strip_color_draw_06); + def_internal_vicon(ICON_STRIP_COLOR_07, vicon_strip_color_draw_07); + def_internal_vicon(ICON_STRIP_COLOR_08, vicon_strip_color_draw_08); + def_internal_vicon(ICON_STRIP_COLOR_09, vicon_strip_color_draw_09); def_internal_vicon(ICON_LIBRARY_DATA_INDIRECT, vicon_strip_color_draw_library_data_indirect); def_internal_vicon(ICON_LIBRARY_DATA_OVERRIDE_NONEDITABLE, diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc index f8c401596b5..5dc02352a93 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.cc +++ b/source/blender/editors/space_sequencer/sequencer_edit.cc @@ -3423,8 +3423,7 @@ void SEQUENCER_OT_strip_color_tag_set(wmOperatorType *ot) /* Flags. */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - RNA_def_enum( - ot->srna, "color", rna_enum_strip_color_items, SEQUENCE_COLOR_NONE, "Color Tag", ""); + RNA_def_enum(ot->srna, "color", rna_enum_strip_color_items, STRIP_COLOR_NONE, "Color Tag", ""); } /** \} */ diff --git a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc index 295694e366e..81178cf3847 100644 --- a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc @@ -295,8 +295,8 @@ static void color3ubv_from_seq(const Scene *curscene, const bool is_muted, uchar r_col[3]) { - if (show_strip_color_tag && uint(strip->color_tag) < SEQUENCE_COLOR_TOT && - strip->color_tag != SEQUENCE_COLOR_NONE) + if (show_strip_color_tag && uint(strip->color_tag) < STRIP_COLOR_TOT && + strip->color_tag != STRIP_COLOR_NONE) { bTheme *btheme = UI_GetTheme(); const ThemeStripColor *strip_color = &btheme->strip_color[strip->color_tag]; diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index cf3058cf71e..2c88a764bf5 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -868,20 +868,20 @@ enum { }; /** #Strip.color_tag. */ -typedef enum SequenceColorTag { - SEQUENCE_COLOR_NONE = -1, - SEQUENCE_COLOR_01, - SEQUENCE_COLOR_02, - SEQUENCE_COLOR_03, - SEQUENCE_COLOR_04, - SEQUENCE_COLOR_05, - SEQUENCE_COLOR_06, - SEQUENCE_COLOR_07, - SEQUENCE_COLOR_08, - SEQUENCE_COLOR_09, +typedef enum StripColorTag { + STRIP_COLOR_NONE = -1, + STRIP_COLOR_01, + STRIP_COLOR_02, + STRIP_COLOR_03, + STRIP_COLOR_04, + STRIP_COLOR_05, + STRIP_COLOR_06, + STRIP_COLOR_07, + STRIP_COLOR_08, + STRIP_COLOR_09, - SEQUENCE_COLOR_TOT, -} SequenceColorTag; + STRIP_COLOR_TOT, +} StripColorTag; /* Strip->StripTransform->filter */ enum { diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 1a8fb4978a6..7a822cd9eb0 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -540,7 +540,7 @@ typedef struct bTheme { /* See COLLECTION_COLOR_TOT for the number of collection colors. */ ThemeCollectionColor collection_color[8]; - /* See SEQUENCE_COLOR_TOT for the total number of strip colors. */ + /* See STRIP_COLOR_TOT for the total number of strip colors. */ ThemeStripColor strip_color[9]; int active_theme_area; diff --git a/source/blender/makesrna/intern/rna_sequencer.cc b/source/blender/makesrna/intern/rna_sequencer.cc index d19e0337d24..b06a0a9de5a 100644 --- a/source/blender/makesrna/intern/rna_sequencer.cc +++ b/source/blender/makesrna/intern/rna_sequencer.cc @@ -98,16 +98,16 @@ const EnumPropertyItem rna_enum_sequence_sound_modifier_type_items[] = { }; const EnumPropertyItem rna_enum_strip_color_items[] = { - {SEQUENCE_COLOR_NONE, "NONE", ICON_X, "None", "Assign no color tag to the collection"}, - {SEQUENCE_COLOR_01, "COLOR_01", ICON_SEQUENCE_COLOR_01, "Color 01", ""}, - {SEQUENCE_COLOR_02, "COLOR_02", ICON_SEQUENCE_COLOR_02, "Color 02", ""}, - {SEQUENCE_COLOR_03, "COLOR_03", ICON_SEQUENCE_COLOR_03, "Color 03", ""}, - {SEQUENCE_COLOR_04, "COLOR_04", ICON_SEQUENCE_COLOR_04, "Color 04", ""}, - {SEQUENCE_COLOR_05, "COLOR_05", ICON_SEQUENCE_COLOR_05, "Color 05", ""}, - {SEQUENCE_COLOR_06, "COLOR_06", ICON_SEQUENCE_COLOR_06, "Color 06", ""}, - {SEQUENCE_COLOR_07, "COLOR_07", ICON_SEQUENCE_COLOR_07, "Color 07", ""}, - {SEQUENCE_COLOR_08, "COLOR_08", ICON_SEQUENCE_COLOR_08, "Color 08", ""}, - {SEQUENCE_COLOR_09, "COLOR_09", ICON_SEQUENCE_COLOR_09, "Color 09", ""}, + {STRIP_COLOR_NONE, "NONE", ICON_X, "None", "Assign no color tag to the collection"}, + {STRIP_COLOR_01, "COLOR_01", ICON_STRIP_COLOR_01, "Color 01", ""}, + {STRIP_COLOR_02, "COLOR_02", ICON_STRIP_COLOR_02, "Color 02", ""}, + {STRIP_COLOR_03, "COLOR_03", ICON_STRIP_COLOR_03, "Color 03", ""}, + {STRIP_COLOR_04, "COLOR_04", ICON_STRIP_COLOR_04, "Color 04", ""}, + {STRIP_COLOR_05, "COLOR_05", ICON_STRIP_COLOR_05, "Color 05", ""}, + {STRIP_COLOR_06, "COLOR_06", ICON_STRIP_COLOR_06, "Color 06", ""}, + {STRIP_COLOR_07, "COLOR_07", ICON_STRIP_COLOR_07, "Color 07", ""}, + {STRIP_COLOR_08, "COLOR_08", ICON_STRIP_COLOR_08, "Color 08", ""}, + {STRIP_COLOR_09, "COLOR_09", ICON_STRIP_COLOR_09, "Color 09", ""}, {0, nullptr, 0, nullptr, nullptr}, }; diff --git a/source/blender/sequencer/intern/sequencer.cc b/source/blender/sequencer/intern/sequencer.cc index 3b069106809..9de95e4c560 100644 --- a/source/blender/sequencer/intern/sequencer.cc +++ b/source/blender/sequencer/intern/sequencer.cc @@ -157,7 +157,7 @@ Strip *SEQ_sequence_alloc(ListBase *lb, int timeline_frame, int machine, int typ strip->stereo3d_format = static_cast( MEM_callocN(sizeof(Stereo3dFormat), "Sequence Stereo Format")); - strip->color_tag = SEQUENCE_COLOR_NONE; + strip->color_tag = STRIP_COLOR_NONE; if (strip->type == STRIP_TYPE_META) { SEQ_channels_ensure(&strip->channels);