Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Joilnen committed Aug 28, 2023
2 parents e6db318 + 8b4eadf commit 6484d97
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/base/Types.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ void HSV::fromRgba(const Color4F& rgba)
h = 360 + h;
}

this->a = a;
this->a = rgba.a;
}

Color4F HSV::toRgba() const
Expand Down Expand Up @@ -641,7 +641,7 @@ void HSL::fromRgba(const Color4F& rgba)
h /= 6;
}

this->a = a;
this->a = rgba.a;
}

float HSL::hue2rgb(float p, float q, float t)
Expand Down

0 comments on commit 6484d97

Please sign in to comment.