summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorlupoDharkael <izhe@hotmail.es>2018-10-25 16:13:51 +0200
committerlupoDharkael <izhe@hotmail.es>2018-10-26 17:25:57 +0200
commit2380f320e0977a0ab0488bd7138fddc8c8740e12 (patch)
tree833699f12174161d3def686711d99a5900daa5fd /core
parent7a42df3626159d1d81d2b5aabf13f19ef1951976 (diff)
Update GDNantive API
Add missing Rect2 methods to GDNative API Add missing Quat methods to GDNative API Add missing NodePath methods to GDNative API Add missing String methods to GDNative API Add missing Array methods to GDNative API Add missing Basis methods to GDNative API Add missing Color methods to GDNative API Update gdnative_api.json
Diffstat (limited to 'core')
-rw-r--r--core/color.cpp2
-rw-r--r--core/color.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/color.cpp b/core/color.cpp
index 55dd1ec6b9..ac314417ec 100644
--- a/core/color.cpp
+++ b/core/color.cpp
@@ -468,7 +468,7 @@ String Color::to_html(bool p_alpha) const {
return txt;
}
-Color Color::from_hsv(float p_h, float p_s, float p_v, float p_a) {
+Color Color::from_hsv(float p_h, float p_s, float p_v, float p_a) const {
p_h = Math::fmod(p_h * 360.0f, 360.0f);
if (p_h < 0.0)
diff --git a/core/color.h b/core/color.h
index add61343ff..d6ad5f91c5 100644
--- a/core/color.h
+++ b/core/color.h
@@ -194,7 +194,7 @@ struct Color {
static bool html_is_valid(const String &p_color);
static Color named(const String &p_name);
String to_html(bool p_alpha = true) const;
- Color from_hsv(float p_h, float p_s, float p_v, float p_a);
+ Color from_hsv(float p_h, float p_s, float p_v, float p_a) const;
static Color from_rgbe9995(uint32_t p_color);
_FORCE_INLINE_ bool operator<(const Color &p_color) const; //used in set keys