[Bf-blender-cvs] [eff273c0bc3] master: Fix T64463: Visual Artifacts with ColorRamp

[Harley Acheson]

Commit: eff273c0bc31fa321c35e132949eb8a6062952dc
Author: Harley Acheson
Date:   Sun May 12 15:21:43 2019 -0700
Branches: master
https://developer.blender.org/rBeff273c0bc31fa321c35e132949eb8a6062952dc

Fix T64463: Visual Artifacts with ColorRamp

This patch fixes an issue with the ColorRamp overflowing its drawing bounds

Differential Revision: https://developer.blender.org/D4843

Reviewed by Brecht Van Lommel

===================================================================

M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/editors/interface/interface_draw.c
M	source/blender/editors/interface/interface_widgets.c

===================================================================

diff --git a/release/scripts/addons b/release/scripts/addons
index fa8787a67ee..20f59bfd2bc 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit fa8787a67ee6b34712896637edb0574973447a9b
+Subproject commit 20f59bfd2bc12cc67d045c11f47b6925e3b2a0a1
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index f72ec13e35d..2e2931867a5 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit f72ec13e35dbd635c08ca331c8fac54086b0811d
+Subproject commit 2e2931867a5ccb455e16e0ccf19d77530fb5e69a
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 655c0b1775c..640d5127446 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -1599,8 +1599,8 @@ void ui_draw_but_COLORBAND(uiBut *but, const uiWidgetColors *UNUSED(wcol), const
     return;
   }
 
-  float x1 = rect->xmin + (0.25f * UI_UNIT_X);
-  float sizex = rect->xmax - x1 - (0.30f * UI_UNIT_X);
+  float x1 = rect->xmin;
+  float sizex = rect->xmax - x1;
   float sizey = BLI_rcti_size_y(rect);
   float sizey_solid = sizey * 0.25f;
   float y1 = rect->ymin;
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 5bcbc18fe27..594793371ae 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -4645,6 +4645,9 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
         break;
 
       case UI_BTYPE_COLORBAND:
+        /* do not draw right to edge of rect */
+        rect->xmin += (0.25f * UI_UNIT_X);
+        rect->xmax -= (0.3f * UI_UNIT_X);
         ui_draw_but_COLORBAND(but, &tui->wcol_regular, rect);
         break;