diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-04 15:57:36 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-06-04 15:57:36 +0200 |
| commit | 0e122566d0dcb1e24ae8347ce4e03121df6478c1 (patch) | |
| tree | 2bdadf83b1482b859b70f71b9264f149aa63f3ee /modules/gdscript/gd_functions.cpp | |
| parent | 95773c478555728c7c0a183185c9d0cab5cff300 (diff) | |
| parent | 43dad78209e76fc37ae8b46ac3a8ffe4a589eb55 (diff) | |
Merge pull request #5022 from vnen/pr-fix-color8
Fix Color8 constructor using wrong value range
Diffstat (limited to 'modules/gdscript/gd_functions.cpp')
| -rw-r--r-- | modules/gdscript/gd_functions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp index 1c05a71d01..5ea5908c5f 100644 --- a/modules/gdscript/gd_functions.cpp +++ b/modules/gdscript/gd_functions.cpp @@ -1010,11 +1010,11 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va VALIDATE_ARG_NUM(1); VALIDATE_ARG_NUM(2); - Color color(*p_args[0],*p_args[1],*p_args[2]); + Color color((float)*p_args[0]/255.0f,(float)*p_args[1]/255.0f,(float)*p_args[2]/255.0f); if (p_arg_count==4) { VALIDATE_ARG_NUM(3); - color.a=*p_args[3]; + color.a=(float)*p_args[3]/255.0f; } r_ret=color; |