[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47198] branches/soc-2012-swiss_cheese/ source/blender/editors/interface/resources.c: reversing an edit I did not mean to commit
Jason Wilkins
Jason.A.Wilkins at gmail.com
Wed May 30 01:46:34 CEST 2012
Revision: 47198
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47198
Author: jwilkins
Date: 2012-05-29 23:46:33 +0000 (Tue, 29 May 2012)
Log Message:
-----------
reversing an edit I did not mean to commit
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/source/blender/editors/interface/resources.c
Modified: branches/soc-2012-swiss_cheese/source/blender/editors/interface/resources.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/interface/resources.c 2012-05-29 22:59:30 UTC (rev 47197)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/interface/resources.c 2012-05-29 23:46:33 UTC (rev 47198)
@@ -53,9 +53,6 @@
#include "BIF_gl.h"
-#define GPU_MANGLE_DEPRECATED 0
-#include "GPU_compatibility.h"
-
#include "UI_interface.h"
#include "UI_interface_icons.h"
@@ -904,7 +901,6 @@
cp = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid);
glColor3ubv(cp);
- gpuColor3ubv(cp);
}
// plus alpha
@@ -914,7 +910,6 @@
cp = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid);
glColor4ubv(cp);
- gpuColor4ubv(cp);
}
// set the color with offset for shades
@@ -932,7 +927,6 @@
CLAMP(b, 0, 255);
//glColor3ub(r, g, b);
glColor4ub(r, g, b, cp[3]);
- gpuColor4ub(r, g, b, cp[3]);
}
void UI_ThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset)
{
@@ -949,7 +943,6 @@
a = alphaoffset + (int) cp[3];
CLAMP(a, 0, 255);
glColor4ub(r, g, b, a);
- gpuColor4ub(r, g, b, a);
}
// blend between to theme colors, and set it
@@ -967,7 +960,6 @@
b = floorf((1.0f - fac) * cp1[2] + fac * cp2[2]);
glColor3ub(r, g, b);
- gpuColor3ub(r, g, b);
}
// blend between to theme colors, shade it, and set it
@@ -989,7 +981,6 @@
CLAMP(b, 0, 255);
glColor3ub(r, g, b);
- gpuColor3ub(r, g, b);
}
// blend between to theme colors, shade it, and set it
@@ -1013,7 +1004,6 @@
CLAMP(a, 0, 255);
glColor4ub(r, g, b, a);
- gpuColor4ub(r, g, b, a);
}
More information about the Bf-blender-cvs
mailing list