diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index d6f14ec2720..77db282918b 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -278,7 +278,14 @@ const bTheme U_theme_default = {
},
.common = {
.anim = {
+ .playhead = RGBA(0x4772b3ff),
.preview_range = RGBA(0xa14d0066),
+ .time_marker = RGBA(0xffffff4d),
+ .time_marker_selected = RGBA(0xffffffb3),
+ .channel = RGBA(0x194e8080),
+ .channel_sub = RGBA(0x0f2c4d80),
+ .channel_group = RGBA(0x1a332d37),
+ .channel_group_active = RGBA(0x216d5b67),
},
},
.space_properties = {
@@ -347,7 +354,6 @@ const bTheme U_theme_default = {
.bone_pose = RGBA(0x50c8ff50),
.bone_pose_active = RGBA(0x8cffff50),
.bone_locked_weight = RGBA(0xff000080),
- .cframe = RGBA(0x4772b3ff),
.before_current_frame = RGBA(0xf22e23ff),
.after_current_frame = RGBA(0x78f244ff),
.time_keyframe = RGBA(0xddd700ff),
@@ -417,15 +423,10 @@ const bTheme U_theme_default = {
.shade1 = RGBA(0x96969600),
.shade2 = RGBA(0x12121264),
.grid = RGBA(0x1a1a1aff),
- .group = RGBA(0x1a332dff),
- .group_active = RGBA(0x216d5bff),
.vertex = RGBA(0x000000ff),
.vertex_select = RGBA(0xff8500ff),
.vertex_active = RGBA(0xffffffff),
- .cframe = RGBA(0x4772b3ff),
.time_scrub_background = RGBA(0x161616ff),
- .time_marker_line = RGBA(0xffffff4d),
- .time_marker_line_selected = RGBA(0xffffffb3),
.lastsel_point = RGBA(0xffffffff),
.handle_auto = RGBA(0x909000ff),
.handle_vect = RGBA(0x409030ff),
@@ -435,8 +436,6 @@ const bTheme U_theme_default = {
.handle_sel_vect = RGBA(0x40c030ff),
.handle_sel_align = RGBA(0xf090a0ff),
.handle_sel_auto_clamped = RGBA(0xf0af90ff),
- .ds_channel = RGBA(0x194e80ff),
- .ds_subchannel = RGBA(0x0f2c4dff),
.vertex_size = 6,
.outline_width = 1,
.facedot_size = 4,
@@ -484,16 +483,9 @@ const bTheme U_theme_default = {
.shade2 = RGBA(0x1d1d1d99),
.hilite = RGBA(0x60c04044),
.grid = RGBA(0x161616ff),
- .group = RGBA(0x1a332d37),
- .group_active = RGBA(0x216d5b67),
.strip = RGBA(0xffffff1f),
.strip_select = RGBA(0xff8c0099),
- .cframe = RGBA(0x4772b3ff),
.time_scrub_background = RGBA(0x1d1d1dff),
- .time_marker_line = RGBA(0xffffff4d),
- .time_marker_line_selected = RGBA(0xffffffb3),
- .ds_channel = RGBA(0x194e8080),
- .ds_subchannel = RGBA(0x0f2c4d80),
.ds_ipoline = RGBA(0x94e575cc),
.keytype_keyframe = RGBA(0xbfbfbfff),
.keytype_extreme = RGBA(0xe8b3ccff),
@@ -535,12 +527,7 @@ const bTheme U_theme_default = {
.grid = RGBA(0x2a2a2aff),
.strip = RGBA(0x0d0d0d80),
.strip_select = RGBA(0xff8c00ff),
- .cframe = RGBA(0x4772b3ff),
.time_scrub_background = RGBA(0x161616ff),
- .time_marker_line = RGBA(0xffffff4d),
- .time_marker_line_selected = RGBA(0xffffffb3),
- .ds_channel = RGBA(0x0f2c4dff),
- .ds_subchannel = RGBA(0x7d98b3ff),
.keyborder = RGBA(0x000000ff),
.keyborder_select = RGBA(0x000000ff),
.vertex_size = 3,
@@ -577,12 +564,9 @@ const bTheme U_theme_default = {
.grid = RGBA(0x303030ff),
.vertex_select = RGBA(0xff8500ff),
.bone_pose = RGBA(0x50c8ff50),
- .cframe = RGBA(0x4772b3ff),
.before_current_frame = RGBA(0xf22e23ff),
.after_current_frame = RGBA(0x78f244ff),
.time_scrub_background = RGBA(0x121212ff),
- .time_marker_line = RGBA(0xffffff4d),
- .time_marker_line_selected = RGBA(0xffffffb3),
.keytype_keyframe = RGBA(0xbfbfbfff),
.keytype_extreme = RGBA(0xe8b3ccff),
.keytype_breakdown = RGBA(0xb3dbe8ff),
@@ -637,7 +621,6 @@ const bTheme U_theme_default = {
.face = RGBA(0xffffff0a),
.face_select = RGBA(0xff85003c),
.face_dot = RGBA(0xff8500ff),
- .cframe = RGBA(0x4772b3ff),
.freestyle_face_mark = RGBA(0x7fff7f33),
.handle_auto = RGBA(0x909000ff),
.handle_align = RGBA(0x803060ff),
@@ -812,10 +795,7 @@ const bTheme U_theme_default = {
.grid = RGBA(0x181818ff),
.strip = RGBA(0xffffff80),
.strip_select = RGBA(0xff8c00ff),
- .cframe = RGBA(0x4772b3ff),
.time_scrub_background = RGBA(0x181818ff),
- .time_marker_line = RGBA(0xffffff4d),
- .time_marker_line_selected = RGBA(0xffffffb3),
.handle_auto = RGBA(0x909000ff),
.handle_align = RGBA(0x803060ff),
.handle_auto_clamped = RGBA(0x99403000),
diff --git a/scripts/presets/interface_theme/Blender_Light.xml b/scripts/presets/interface_theme/Blender_Light.xml
index 1b688642c48..de76d6a07e6 100644
--- a/scripts/presets/interface_theme/Blender_Light.xml
+++ b/scripts/presets/interface_theme/Blender_Light.xml
@@ -383,6 +383,23 @@
+
+
+
+
+
+
+
+
@@ -735,7 +729,6 @@
preview_stitch_unstitchable="#ff0000ff"
preview_stitch_active="#e1d2c323"
uv_shadow="#707070ff"
- frame_current="#5680c2"
metadatabg="#000000"
metadatatext="#ffffff"
handle_free="#000000"
@@ -790,10 +783,7 @@
text_strip="#824c8f"
active_strip="#ffffff"
selected_strip="#ff6a00"
- frame_current="#5680c2"
time_scrub_background="#292929e6"
- time_marker_line="#00000060"
- time_marker_line_selected="#ffffff60"
keyframe="#ff8500"
keyframe_selected="#ffbe33"
keyframe_breakdown="#b3dbe8"
@@ -808,7 +798,6 @@
preview_back="#000000"
metadatabg="#000000"
metadatatext="#ffffff"
- preview_range="#a14d0066"
row_alternate="#ffffff0d"
text_strip_cursor="#71a8ffff"
selected_text="#19191a4d"
@@ -1073,15 +1062,11 @@
path_after="#0000ff"
path_keyframe_before="#ffc4c4"
path_keyframe_after="#c4c4ff"
- frame_current="#5680c2"
time_scrub_background="#292929e6"
- time_marker_line="#00000060"
- time_marker_line_selected="#ffffff60"
strips="#0c0a0a"
strips_selected="#ff8c00"
metadatabg="#000000"
metadatatext="#ffffff"
- preview_range="#a14d0066"
handle_free="#000000"
handle_auto="#909000"
handle_align="#803060"
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index ca9b153f37a..2a9b99c1db1 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -27,7 +27,7 @@
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 55
+#define BLENDER_FILE_SUBVERSION 56
/* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and cancel loading the file, showing a warning to
diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc
index f763adfb0e5..3467928930b 100644
--- a/source/blender/blenloader/intern/versioning_userdef.cc
+++ b/source/blender/blenloader/intern/versioning_userdef.cc
@@ -368,6 +368,16 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_node.node_zone_repeat);
}
+ if (!USER_VERSION_ATLEAST(500, 56)) {
+ FROM_DEFAULT_V4_UCHAR(common.anim.playhead);
+ FROM_DEFAULT_V4_UCHAR(common.anim.time_marker);
+ FROM_DEFAULT_V4_UCHAR(common.anim.time_marker_selected);
+ FROM_DEFAULT_V4_UCHAR(common.anim.channel);
+ FROM_DEFAULT_V4_UCHAR(common.anim.channel_sub);
+ FROM_DEFAULT_V4_UCHAR(common.anim.channel_group);
+ FROM_DEFAULT_V4_UCHAR(common.anim.channel_group_active);
+ }
+
/**
* Always bump subversion in BKE_blender_version.h when adding versioning
* code here, and wrap it inside a USER_VERSION_ATLEAST check.
diff --git a/source/blender/editors/interface/resources.cc b/source/blender/editors/interface/resources.cc
index f18249db023..667594067d8 100644
--- a/source/blender/editors/interface/resources.cc
+++ b/source/blender/editors/interface/resources.cc
@@ -331,10 +331,10 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
cp = ts->time_scrub_background;
break;
case TH_TIME_MARKER_LINE:
- cp = ts->time_marker_line;
+ cp = btheme->common.anim.time_marker;
break;
case TH_TIME_MARKER_LINE_SELECTED:
- cp = ts->time_marker_line_selected;
+ cp = btheme->common.anim.time_marker_selected;
break;
case TH_VIEW_OVERLAY:
cp = ts->view_overlay;
@@ -367,10 +367,10 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
cp = ts->active;
break;
case TH_GROUP:
- cp = ts->group;
+ cp = btheme->common.anim.channel_group;
break;
case TH_GROUP_ACTIVE:
- cp = ts->group_active;
+ cp = btheme->common.anim.channel_group_active;
break;
case TH_TRANSFORM:
cp = ts->transform;
@@ -535,7 +535,7 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
cp = ts->keyborder_select;
break;
case TH_CFRAME:
- cp = ts->cframe;
+ cp = btheme->common.anim.playhead;
break;
case TH_FRAME_BEFORE:
cp = ts->before_current_frame;
@@ -800,10 +800,10 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
break;
case TH_DOPESHEET_CHANNELOB:
- cp = ts->ds_channel;
+ cp = btheme->common.anim.channel;
break;
case TH_DOPESHEET_CHANNELSUBOB:
- cp = ts->ds_subchannel;
+ cp = btheme->common.anim.channel_sub;
break;
case TH_DOPESHEET_IPOLINE:
cp = ts->ds_ipoline;
diff --git a/source/blender/makesdna/DNA_theme_types.h b/source/blender/makesdna/DNA_theme_types.h
index 25e21c3f8a9..256e4b45551 100644
--- a/source/blender/makesdna/DNA_theme_types.h
+++ b/source/blender/makesdna/DNA_theme_types.h
@@ -107,13 +107,17 @@ typedef struct uiStyle {
} uiStyle;
typedef struct ThemeCommonAnim {
- /** Preview range overlay. */
+ unsigned char playhead[4];
unsigned char preview_range[4];
+
+ unsigned char time_marker[4], time_marker_selected[4];
+
+ unsigned char channel[4], channel_sub[4];
+ unsigned char channel_group[4], channel_group_active[4];
} ThemeCommonAnim;
typedef struct ThemeCommon {
ThemeCommonAnim anim;
- char _pad[4];
} ThemeCommon;
typedef struct uiWidgetColors {
@@ -278,7 +282,7 @@ typedef struct ThemeSpace {
unsigned char wire[4], wire_edit[4], select[4];
unsigned char lamp[4], speaker[4], empty[4], camera[4];
- unsigned char active[4], group[4], group_active[4], transform[4];
+ unsigned char active[4], transform[4];
unsigned char vertex[4], vertex_select[4], vertex_active[4], vertex_bevel[4],
vertex_unreferenced[4];
unsigned char edge[4], edge_select[4], edge_mode_select[4];
@@ -294,12 +298,11 @@ typedef struct ThemeSpace {
unsigned char loop_normal[4];
unsigned char bone_solid[4], bone_pose[4], bone_pose_active[4], bone_locked_weight[4];
unsigned char strip[4], strip_select[4];
- unsigned char cframe[4];
unsigned char before_current_frame[4], after_current_frame[4];
unsigned char time_keyframe[4], time_gp_keyframe[4];
unsigned char freestyle_edge_mark[4], freestyle_face_mark[4];
unsigned char time_scrub_background[4];
- unsigned char time_marker_line[4], time_marker_line_selected[4];
+ char _pad9[4];
unsigned char nurb_uline[4], nurb_vline[4];
unsigned char act_spline[4], nurb_sel_uline[4], nurb_sel_vline[4], lastsel_point[4];
@@ -310,7 +313,7 @@ typedef struct ThemeSpace {
handle_sel_auto_clamped[4];
/** Dope-sheet. */
- unsigned char ds_channel[4], ds_subchannel[4], ds_ipoline[4];
+ unsigned char ds_ipoline[4];
/** Key-types. */
unsigned char keytype_keyframe[4], keytype_extreme[4], keytype_breakdown[4], keytype_jitter[4],
keytype_movehold[4], keytype_generated[4];
diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc
index 8ae5c0da322..e29693e2e11 100644
--- a/source/blender/makesrna/intern/rna_userdef.cc
+++ b/source/blender/makesrna/intern/rna_userdef.cc
@@ -2155,11 +2155,53 @@ static void rna_def_userdef_theme_common_anim(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "ThemeCommonAnim");
RNA_def_struct_ui_text(srna, "Common Animation Properties", "Shared animation theme properties");
+ prop = RNA_def_property(srna, "playhead", PROP_FLOAT, PROP_COLOR_GAMMA);
+ RNA_def_property_float_sdna(prop, nullptr, "playhead");
+ RNA_def_property_array(prop, 3);
+ RNA_def_property_ui_text(prop, "Playhead", "");
+ RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
+
prop = RNA_def_property(srna, "preview_range", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, nullptr, "preview_range");
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Preview Range", "Color of preview range overlay");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
+
+ /* Marker properties */
+ prop = RNA_def_property(srna, "time_marker", PROP_FLOAT, PROP_COLOR_GAMMA);
+ RNA_def_property_array(prop, 4);
+ RNA_def_property_ui_text(prop, "Marker Line", "");
+ RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
+
+ prop = RNA_def_property(srna, "time_marker_selected", PROP_FLOAT, PROP_COLOR_GAMMA);
+ RNA_def_property_array(prop, 4);
+ RNA_def_property_ui_text(prop, "Marker Line Selected", "");
+ RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
+
+ /* Channel properties */
+ prop = RNA_def_property(srna, "channel", PROP_FLOAT, PROP_COLOR_GAMMA);
+ RNA_def_property_float_sdna(prop, nullptr, "channel");
+ RNA_def_property_array(prop, 4);
+ RNA_def_property_ui_text(prop, "Channel", "");
+ RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
+
+ prop = RNA_def_property(srna, "channel_sub", PROP_FLOAT, PROP_COLOR_GAMMA);
+ RNA_def_property_float_sdna(prop, nullptr, "channel_sub");
+ RNA_def_property_array(prop, 4);
+ RNA_def_property_ui_text(prop, "Sub-channel", "");
+ RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
+
+ prop = RNA_def_property(srna, "channel_group", PROP_FLOAT, PROP_COLOR_GAMMA);
+ RNA_def_property_float_sdna(prop, nullptr, "channel_group");
+ RNA_def_property_array(prop, 4);
+ RNA_def_property_ui_text(prop, "Channel Group", "");
+ RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
+
+ prop = RNA_def_property(srna, "channel_group_active", PROP_FLOAT, PROP_COLOR_GAMMA);
+ RNA_def_property_float_sdna(prop, nullptr, "channel_group_active");
+ RNA_def_property_array(prop, 4);
+ RNA_def_property_ui_text(prop, "Active Channel Group", "");
+ RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
}
static void rna_def_userdef_theme_common(BlenderRNA *brna)
@@ -2841,12 +2883,6 @@ static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
/* Time specific. */
- prop = RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "cframe");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Current Frame", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "before_current_frame", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(
@@ -2931,27 +2967,11 @@ static void rna_def_userdef_theme_space_graph(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Grid", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "cframe");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Current Frame", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "time_scrub_background", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Scrubbing/Markers Region", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "time_marker_line", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Marker Line", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "time_marker_line_selected", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Marker Line Selected", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "window_sliders", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, nullptr, "shade1");
RNA_def_property_array(prop, 3);
@@ -2964,30 +2984,6 @@ static void rna_def_userdef_theme_space_graph(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Channels Region", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "dopesheet_channel", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "ds_channel");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Dope Sheet Channel", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "dopesheet_subchannel", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "ds_subchannel");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Dope Sheet Sub-channel", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "channel_group", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "group");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Channel Group", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "active_channels_group", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "group_active");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Active Channel Group", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
rna_def_userdef_theme_spaces_vertex(srna, true);
rna_def_userdef_theme_spaces_curves(srna, false, true, true, true);
}
@@ -3628,12 +3624,6 @@ static void rna_def_userdef_theme_space_image(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Texture Paint/Modifier UVs", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "cframe");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Current Frame", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "metadatabg", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, nullptr, "metadatabg");
RNA_def_property_array(prop, 3);
@@ -3751,27 +3741,11 @@ static void rna_def_userdef_theme_space_seq(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Selected Strips", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "cframe");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Current Frame", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "time_scrub_background", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Scrubbing/Markers Region", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "time_marker_line", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Marker Line", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "time_marker_line_selected", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Marker Line Selected", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "keyframe", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, nullptr, "keytype_keyframe");
RNA_def_property_array(prop, 3);
@@ -3897,27 +3871,11 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Grid", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "cframe");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Current Frame", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "time_scrub_background", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Scrubbing/Markers Region", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "time_marker_line", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Marker Line", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "time_marker_line_selected", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Marker Line Selected", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "value_sliders", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, nullptr, "face");
RNA_def_property_array(prop, 3);
@@ -3930,18 +3888,6 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "View Sliders", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "dopesheet_channel", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "ds_channel");
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Dope Sheet Channel", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "dopesheet_subchannel", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "ds_subchannel");
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Dope Sheet Sub-channel", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "channels", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, nullptr, "shade2");
RNA_def_property_array(prop, 4);
@@ -3954,18 +3900,6 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Channels Selected", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "channel_group", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "group");
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Channel Group", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "active_channels_group", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "group_active");
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Active Channel Group", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "long_key", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, nullptr, "strip");
RNA_def_property_array(prop, 4);
@@ -4120,18 +4054,6 @@ static void rna_def_userdef_theme_space_nla(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "View Sliders", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "dopesheet_channel", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "ds_channel");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Channel", "Nonlinear Animation Channel");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "dopesheet_subchannel", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "ds_subchannel");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Sub-channel", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "nla_track", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, nullptr, "nla_track");
RNA_def_property_array(prop, 3);
@@ -4231,26 +4153,10 @@ static void rna_def_userdef_theme_space_nla(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Keyframe Border Selected", "Color of selected keyframe border");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "cframe");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Current Frame", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "time_scrub_background", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Scrubbing/Markers Region", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "time_marker_line", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Marker Line", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "time_marker_line_selected", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Marker Line Selected", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
}
static void rna_def_userdef_theme_colorset(BlenderRNA *brna)
@@ -4401,27 +4307,11 @@ static void rna_def_userdef_theme_space_clip(BlenderRNA *brna)
prop, "Path Keyframe After", "Color of keyframes on a path after current frame");
RNA_def_property_update(prop, 0, "rna_userdef_update");
- prop = RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, nullptr, "cframe");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Current Frame", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "time_scrub_background", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Scrubbing/Markers Region", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
- prop = RNA_def_property(srna, "time_marker_line", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Marker Line", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "time_marker_line_selected", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 4);
- RNA_def_property_ui_text(prop, "Marker Line Selected", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
prop = RNA_def_property(srna, "strips", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, nullptr, "strip");
RNA_def_property_array(prop, 3);