diff options
| author | Andreas Haas | 2016-05-31 20:50:19 +0200 |
|---|---|---|
| committer | Andreas Haas | 2016-05-31 20:50:19 +0200 |
| commit | da3247a500662dcbd8e1946ecf0a9af19a146982 (patch) | |
| tree | 8a9eeb7b6594d7f61f7769a9d000aef5d2bd9a51 /core/variant_op.cpp | |
| parent | 4d6d6fcbfc9cd7e37ad38bb83c05f9260e50d5bc (diff) | |
| download | godot-da3247a500662dcbd8e1946ecf0a9af19a146982.tar.gz godot-da3247a500662dcbd8e1946ecf0a9af19a146982.tar.zst godot-da3247a500662dcbd8e1946ecf0a9af19a146982.zip | |
Diffstat (limited to 'core/variant_op.cpp')
| -rw-r--r-- | core/variant_op.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/variant_op.cpp b/core/variant_op.cpp index a9cc37168..6065094da 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -1354,7 +1354,7 @@ void Variant::set(const Variant& p_index, const Variant& p_value, bool *r_valid) return; } else if (*str=="r8" ) { valid=true; - v->g=float(p_value)/255.0; + v->r=float(p_value)/255.0; return; } else if (*str=="g8" ) { valid=true; @@ -2213,16 +2213,16 @@ Variant Variant::get(const Variant& p_index, bool *r_valid) const { return v->get_v(); } else if (*str=="r8") { valid=true; - return v->r*255.0; + return (int)Math::round(v->r*255.0); } else if (*str=="g8" ) { valid=true; - return v->g*255.0; + return (int)Math::round(v->g*255.0); } else if (*str=="b8" ) { valid=true; - return v->b*255.0; + return (int)Math::round(v->b*255.0); } else if (*str=="a8" ) { valid=true; - return v->a*255.0; + return (int)Math::round(v->a*255.0); } } else if (p_index.get_type()==Variant::INT) { |
