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:
-rw-r--r--release/datafiles/userdef/userdef_default_theme.c2
-rw-r--r--source/blender/editors/screen/area.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index ca891f35859..6187f486a29 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -760,7 +760,7 @@ const bTheme U_theme_default = {
.tab_inactive = RGBA(0x2b2b2bff),
.tab_back = RGBA(0x232323ff),
.tab_outline = RGBA(0x232323ff),
- .button = RGBA(0x424242ff),
+ .button = RGBA(0x42424200),
.button_title = RGBA(0xffffffff),
.button_text = RGBA(0xe5e5e5ff),
.button_text_hi = RGBA(0xffffffff),
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 0a69a53e6fa..f8537f35759 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1107,6 +1107,9 @@ bool ED_region_is_overlap(int spacetype, int regiontype)
return 1;
}
if (U.uiflag2 & USER_REGION_OVERLAP) {
+ if (spacetype == SPACE_NODE && regiontype == RGN_TYPE_TOOLS) {
+ return 1;
+ }
if (ELEM(spacetype, SPACE_VIEW3D, SPACE_SEQ, SPACE_IMAGE)) {
if (ELEM(regiontype, RGN_TYPE_TOOLS, RGN_TYPE_UI, RGN_TYPE_TOOL_PROPS))
return 1;