From d55b2e39f3ff25d21318047bc243758f46887e29 Mon Sep 17 00:00:00 2001 From: Turanszki Janos Date: Wed, 14 Nov 2018 20:57:59 +0000 Subject: [PATCH] wiColor fix --- WickedEngine/wiColor.h | 8 ++++---- WickedEngine/wiVersion.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WickedEngine/wiColor.h b/WickedEngine/wiColor.h index af9be5b1f..7df8d5b1b 100644 --- a/WickedEngine/wiColor.h +++ b/WickedEngine/wiColor.h @@ -14,10 +14,10 @@ struct wiColor constexpr uint8_t getB() const { return (rgba >> 16) & 0xFF; } constexpr uint8_t getA() const { return (rgba >> 24) & 0xFF; } - constexpr void setR(uint8_t value) { wiColor(value, getG(), getB(), getA()); } - constexpr void setG(uint8_t value) { wiColor(getR(), value, getB(), getA()); } - constexpr void setB(uint8_t value) { wiColor(getR(), getG(), value, getA()); } - constexpr void setA(uint8_t value) { wiColor(getR(), getG(), getB(), value); } + constexpr void setR(uint8_t value) { *this = wiColor(value, getG(), getB(), getA()); } + constexpr void setG(uint8_t value) { *this = wiColor(getR(), value, getB(), getA()); } + constexpr void setB(uint8_t value) { *this = wiColor(getR(), getG(), value, getA()); } + constexpr void setA(uint8_t value) { *this = wiColor(getR(), getG(), getB(), value); } constexpr XMFLOAT3 toFloat3() const { diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 9ebb534a3..d937cd22c 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates const int minor = 22; // minor bug fixes, alterations, refactors, updates - const int revision = 17; + const int revision = 18; long GetVersion()