[Bf-blender-cvs] [06c4106d032] blender2.8: Fix for fix, indentation was accidental

Campbell Barton noreply at git.blender.org
Fri Jun 1 15:42:33 CEST 2018


Commit: 06c4106d03214d21b03b7f97dc776749dae59d79
Author: Campbell Barton
Date:   Fri Jun 1 15:42:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB06c4106d03214d21b03b7f97dc776749dae59d79

Fix for fix, indentation was accidental

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

M	source/blender/editors/interface/resources.c

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

diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index fed2808e2c8..8e5bf8f0323 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -184,15 +184,14 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 						cp = ts->list;
 					else if (theme_regionid == RGN_TYPE_HEADER)
 						cp = ts->header;
-					else {
+					else
 						cp = ts->button;
 
-						copy_v4_v4_char(back, cp);
-						if (!ED_region_is_overlap(spacetype, theme_regionid)) {
-							back[3] = 255;
-						}
-						cp = back;
+					copy_v4_v4_char(back, cp);
+					if (!ED_region_is_overlap(spacetype, theme_regionid)) {
+						back[3] = 255;
 					}
+					cp = back;
 					break;
 				case TH_LOW_GRAD:
 					cp = ts->gradients.gradient;



More information about the Bf-blender-cvs mailing list