summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-11-19 00:08:47 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-11-19 00:08:47 -0300
commit0168947084af1991a2af978956e823afb7b17d33 (patch)
tree90cf698b22105ecb62f3a8c5d127a63928c475ef /core
parentea035f308b178ebead3239ae6fd92a4fe5592950 (diff)
parent69fa5ed1c083c8e8bdef9833a37b448ad526c1e4 (diff)
Merge pull request #2518 from masoudbh3/godot-icons
Add icon to exe file in windows export
Diffstat (limited to 'core')
-rw-r--r--core/image.cpp2
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);