summaryrefslogtreecommitdiff
path: root/drivers/pvr
diff options
context:
space:
mode:
authorJuan Linietsky <red@kyoko>2015-05-11 15:49:41 -0300
committerJuan Linietsky <red@kyoko>2015-05-11 15:49:41 -0300
commit4b8745ad63409cf14b02735981ee35d2f794421c (patch)
tree607dcfbb77430e8ed7eef25de6b7bec9c4032aec /drivers/pvr
parentdda60296d81edaabfdb56f47a2c949b5dad283fb (diff)
parentb777bf5ff5c3891daa0f93987ca12d0d7d053c2b (diff)
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'drivers/pvr')
-rw-r--r--drivers/pvr/ColorRgba.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pvr/ColorRgba.h b/drivers/pvr/ColorRgba.h
index 6b46d65e3c..0701420566 100644
--- a/drivers/pvr/ColorRgba.h
+++ b/drivers/pvr/ColorRgba.h
@@ -11,21 +11,21 @@ public:
ColorRgb()
- : r(0)
+ : b(0)
, g(0)
- , b(0) {
+ , r(0) {
}
ColorRgb(T red, T green, T blue)
- : r(red)
+ : b(blue)
, g(green)
- , b(blue) {
+ , r(red) {
}
ColorRgb(const ColorRgb<T> &x)
- : r(x.r)
+ : b(x.b)
, g(x.g)
- , b(x.b) {
+ , r(x.r) {
}
ColorRgb<int> operator *(int x) {