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:
authorSv. Lockal <lockalsash@gmail.com>2012-09-08 23:40:34 +0400
committerSv. Lockal <lockalsash@gmail.com>2012-09-08 23:40:34 +0400
commitbad06c158e62fcf0d3474ef456acb29eeb2bc916 (patch)
treee12a5ef1fe4d7c4eda2a739be259c70c0a322e7c
parent1a7eb3454eb887d9639c435ac0a6f1bd50c9b2bf (diff)
fix for error in own recent commit: do not hide alpha in HSV and Hex modes
-rw-r--r--source/blender/editors/interface/interface_regions.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 301aea896bc..a4f1067d069 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -2021,8 +2021,8 @@ static void picker_new_hide_reveal(uiBlock *block, short colormode)
/* tag buttons */
for (bt = block->buttons.first; bt; bt = bt->next) {
- if (bt->func == do_picker_rna_cb && bt->type == NUMSLI) {
- /* RGB sliders (color circle is always shown) */
+ if (bt->func == do_picker_rna_cb && bt->type == NUMSLI && bt->rnaindex != 3) {
+ /* RGB sliders (color circle and alpha are always shown) */
if (colormode == 0) bt->flag &= ~UI_HIDDEN;
else bt->flag |= UI_HIDDEN;
}