diff options
| author | masoud bh <masoud.bh@chmail.ir> | 2015-11-09 02:23:58 +0330 |
|---|---|---|
| committer | masoud bh <masoud.bh@chmail.ir> | 2015-11-09 02:23:58 +0330 |
| commit | 24f3f43457ac6bdeed95c1ed0a882387a509078a (patch) | |
| tree | b8249a4f8c1674538b80b0a5d22d4b6810f7cf1e /core | |
| parent | 3fcfdfec0ac5175f55527b3ec95d14d48bf29dd2 (diff) | |
Add icon to exe file in windows export
add version_info and icon sections in "export to windows platform".
add version_info and icon to godot exe file (editor & template exe).
fix an problem in image class.
change all default icons to android export icon (a little more rounded).
create an python script for convert file to cpp byte array for use in
'splash.h'.
Diffstat (limited to 'core')
| -rw-r--r-- | core/image.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/image.cpp b/core/image.cpp index 06b7a78488..eadb7ecc8b 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -322,7 +322,7 @@ void Image::set_pallete(const DVector<uint8_t>& p_data) { DVector<uint8_t>::Write wp = data.write(); unsigned char *dst=wp.ptr() + pal_ofs; - DVector<uint8_t>::Read r = data.read(); + DVector<uint8_t>::Read r = p_data.read(); const unsigned char *src=r.ptr(); copymem(dst, src, len); |