summaryrefslogtreecommitdiff
path: root/drivers/pvr
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-05-09 13:09:20 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-05-09 13:09:20 -0300
commit1fd1b7a91b2f60a2841b9684e1e41728275cedaf (patch)
tree17678512dde4890e941c78ba90ba23b184e2ae9a /drivers/pvr
parent1a7d370fcf7382a9e248925a7eef12d28e0bb9e3 (diff)
parent158785636c809d5ebdb6995a088c7776ce45e65c (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) {