diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-05 10:38:13 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-05 10:38:13 -0300 |
| commit | afaa57be301e00d5e6a797846234b4790fbb1576 (patch) | |
| tree | 3d220660eb7e8c53b5c49bea210653d43ec9be03 | |
| parent | 010e3e0ac7edb93c83ac807438548d9b4b26605f (diff) | |
| parent | 8f4aef774d42af7354a93309b1f5149580f3b964 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
| -rw-r--r-- | drivers/jpegd/image_loader_jpegd.cpp | 2 | ||||
| -rw-r--r-- | platform/windows/joystick.h | 3 | ||||
| -rw-r--r-- | tools/export/blender25/io_scene_dae/export_dae.py | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/drivers/jpegd/image_loader_jpegd.cpp b/drivers/jpegd/image_loader_jpegd.cpp index 4805cf4d5d..9d1263b81b 100644 --- a/drivers/jpegd/image_loader_jpegd.cpp +++ b/drivers/jpegd/image_loader_jpegd.cpp @@ -63,7 +63,7 @@ Error ImageLoaderJPG::load_image(Image *p_image,FileAccess *f) { for (int y = 0; y < image_height; y++) { const jpgd::uint8* pScan_line; - uint scan_line_len; + jpgd::uint scan_line_len; if (decoder.decode((const void**)&pScan_line, &scan_line_len) != jpgd::JPGD_SUCCESS) { return ERR_FILE_CORRUPT; diff --git a/platform/windows/joystick.h b/platform/windows/joystick.h index ad62059a73..332e86fbb8 100644 --- a/platform/windows/joystick.h +++ b/platform/windows/joystick.h @@ -44,6 +44,9 @@ if(x != NULL) \ } #endif +#ifndef XUSER_MAX_COUNT +#define XUSER_MAX_COUNT 4 +#endif class joystick_windows { diff --git a/tools/export/blender25/io_scene_dae/export_dae.py b/tools/export/blender25/io_scene_dae/export_dae.py index b846f0e2d8..7ee0e179b8 100644 --- a/tools/export/blender25/io_scene_dae/export_dae.py +++ b/tools/export/blender25/io_scene_dae/export_dae.py @@ -921,7 +921,7 @@ class DaeExporter: if (node.parent.type=="ARMATURE"): armature=node.parent if (armcount>1): - self.operator.report({'WARNING'},'Object "'+node.name+'" refers to more than one armature! This is unsopported.') + self.operator.report({'WARNING'},'Object "'+node.name+'" refers to more than one armature! This is unsupported.') if (armcount==0): self.operator.report({'WARNING'},'Object "'+node.name+'" is child of an armature, but has no armature modifier.') |