Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'release')
-rw-r--r--release/datafiles/userdef/userdef_default_theme.c10
-rw-r--r--release/scripts/presets/keyconfig/keymap_data/blender_default.py12
2 files changed, 11 insertions, 11 deletions
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index b5cab405826..e1794495ee6 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -428,7 +428,7 @@ const bTheme U_theme_default = {
.vertex = RGBA(0x000000ff),
.vertex_select = RGBA(0xff8500ff),
.cframe = RGBA(0x5680c2ff),
- .scrubbing_background = RGBA(0x292929e6),
+ .time_scrub_background = RGBA(0x292929e6),
.lastsel_point = RGBA(0xffffffff),
.handle_auto = RGBA(0x909000ff),
.handle_vect = RGBA(0x409030ff),
@@ -515,7 +515,7 @@ const bTheme U_theme_default = {
.strip = RGBA(0x1a151580),
.strip_select = RGBA(0xff8c00cc),
.cframe = RGBA(0x5680c2ff),
- .scrubbing_background = RGBA(0x292929e6),
+ .time_scrub_background = RGBA(0x292929e6),
.ds_channel = RGBA(0x0f2c4d24),
.ds_subchannel = RGBA(0x143e6624),
.ds_ipoline = RGBA(0x94e575cc),
@@ -569,7 +569,7 @@ const bTheme U_theme_default = {
.strip = RGBA(0x0c0a0a80),
.strip_select = RGBA(0xff8c00ff),
.cframe = RGBA(0x5680c2ff),
- .scrubbing_background = RGBA(0x292929e6),
+ .time_scrub_background = RGBA(0x292929e6),
.ds_channel = RGBA(0x5a85b2ff),
.ds_subchannel = RGBA(0x7d98b3ff),
.keyborder = RGBA(0x000000ff),
@@ -616,7 +616,7 @@ const bTheme U_theme_default = {
.vertex_select = RGBA(0xff8500ff),
.bone_pose = RGBA(0x50c8ff50),
.cframe = RGBA(0x5680c2ff),
- .scrubbing_background = RGBA(0x292929e6),
+ .time_scrub_background = RGBA(0x292929e6),
.vertex_size = 3,
.outline_width = 1,
.facedot_size = 4,
@@ -894,7 +894,7 @@ const bTheme U_theme_default = {
.strip = RGBA(0x0c0a0a80),
.strip_select = RGBA(0xff8c00ff),
.cframe = RGBA(0x5680c2ff),
- .scrubbing_background = RGBA(0x292929e6),
+ .time_scrub_background = RGBA(0x292929e6),
.handle_auto = RGBA(0x909000ff),
.handle_align = RGBA(0x803060ff),
.handle_sel_auto = RGBA(0xf0ff40ff),
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index cba0ec88c19..2935b397326 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -1261,10 +1261,10 @@ def km_markers(params):
return keymap
-def km_scrubbing(params):
+def km_time_scrub(params):
items = []
keymap = (
- "Scrubbing",
+ "Time Scrub",
{"space_type": 'EMPTY', "region_type": 'WINDOW'},
{"items": items},
)
@@ -1276,10 +1276,10 @@ def km_scrubbing(params):
return keymap
-def km_scrubbing_clip(params):
+def km_time_scrub_clip(params):
items = []
keymap = (
- "Clip Scrubbing",
+ "Clip Time Scrub",
{"space_type": 'CLIP_EDITOR', "region_type": 'PREVIEW'},
{"items": items},
)
@@ -5760,8 +5760,8 @@ def generate_keymaps(params=None):
km_view3d(params),
km_mask_editing(params),
km_markers(params),
- km_scrubbing(params),
- km_scrubbing_clip(params),
+ km_time_scrub(params),
+ km_time_scrub_clip(params),
km_graph_editor_generic(params),
km_graph_editor(params),
km_image_generic(params),