diff options
author | Joshua Leung <aligorith@gmail.com> | 2014-12-27 17:02:47 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2014-12-27 17:05:11 +0300 |
commit | 155bb058f4e03a108b06f150b57e273e62d4f339 (patch) | |
tree | 7c9c372f722b7ec0b72075c1b5f9b959c79941ea /release | |
parent | 4ab58837667c990baeddea2e9d722c3203743c9c (diff) |
GPencil UI: Color swatches for both Stroke and Fill colors are now shown
The layers list and the Dopesheet channels now show color swatches for both the
stroke and fill colours now. This is useful when you've got layers that only
use either/or.
* Currently, these only get shown if the relevant opacity setting is high enough
for that aspect to contribute to the result.
* The sizing of these items could do with some more tweaking (especially in the
Dopesheet), as these may now be too small to accurately see and/or interact with.
* There are some potential issues when using near-gray (or actually, colours similar
to the list backgrounds, but that issue exists in other areas of Blender anyway.
(NOTE: At this stage, these changes are still experimental, and not for 2.73 yet)
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_grease_pencil_common.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 82f18a15469..75f6921b0c3 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -302,9 +302,11 @@ class GPENCIL_UL_layer(UIList): if gpl.lock: layout.active = False - split = layout.split(percentage=0.2) - split.prop(gpl, "color", text="") - split.prop(gpl, "info", text="", emboss=False) + split = layout.split(percentage=0.25) + row = split.row(align=True) + row.prop(gpl, "color", text="", emboss = gpl.is_stroke_visible) + row.prop(gpl, "fill_color", text="", emboss = gpl.is_fill_visible) + split.prop(gpl, "info", text="", emboss=False) row = layout.row(align=True) row.prop(gpl, "lock", text="", emboss=False) |