diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-09-11 18:45:20 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-09-11 18:45:20 +0300 |
| commit | 9a2d04677a071e98a9e5136f1340a5aa55c2d753 (patch) | |
| tree | 0fca2bbac5a241517c2278e55b62ff7b0a7a5db9 /release | |
| parent | 2f22d6aa7c4a2b54d8561f28115696a55e63abc8 (diff) | |
| parent | 3c26181cd955549ca0d094b38cacb41bd752327a (diff) | |
Merge branch 'property-search-add-theme-color' into property-search-single-tab
Diffstat (limited to 'release')
| -rw-r--r-- | release/datafiles/userdef/userdef_default_theme.c | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 3 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 1 |
3 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 096e2f633d5..c837322604d 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -715,6 +715,7 @@ const bTheme U_theme_default = { .paint_curve_pivot = RGBA(0xff7f7f7f), .paint_curve_handle = RGBA(0x7fff7f7f), .metadatatext = RGBA(0xffffffff), + .grid = RGBA(0x505050ff), }, .space_text = { .back = RGBA(0x30303000), diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index a490208fd5e..0fde128a906 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -1019,7 +1019,8 @@ class IMAGE_PT_view_display_uv_edit_overlays(Panel): col.prop(uvedit, "show_faces", text="Faces") col = layout.column() - col.prop(uvedit, "show_smooth_edges", text="Smooth") + if context.preferences.experimental.use_image_editor_legacy_drawing: + col.prop(uvedit, "show_smooth_edges", text="Smooth") col.prop(uvedit, "show_modified_edges", text="Modified") col.prop(uvedit, "uv_opacity") diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 506849fbee5..faea806c6cb 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -2194,6 +2194,7 @@ class USERPREF_PT_experimental_debugging(ExperimentalPanel, Panel): context, ( ({"property": "use_undo_legacy"}, "T60695"), ({"property": "use_cycles_debug"}, None), + ({"property": "use_image_editor_legacy_drawing"}, "T67530"), ), ) |