From 3f64fd64eb6acf57c98e285df3ebf05678140040 Mon Sep 17 00:00:00 2001 From: hondres Date: Tue, 5 Jan 2016 01:16:10 +0100 Subject: [PATCH 1/3] define XUSER_MAX_COUNT if not present --- platform/windows/joystick.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/windows/joystick.h b/platform/windows/joystick.h index ad62059a73d..332e86fbb82 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 { From a13ed54ad48beb796f978d991fcaf8b4d2e7f90d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 5 Jan 2016 12:04:25 +0100 Subject: [PATCH 2/3] Fix typo --- tools/export/blender25/io_scene_dae/export_dae.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/export/blender25/io_scene_dae/export_dae.py b/tools/export/blender25/io_scene_dae/export_dae.py index b846f0e2d8e..7ee0e179b87 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.') From 88ecc29d1e5d731cdc3689d235c30e850e5912d7 Mon Sep 17 00:00:00 2001 From: mrezai Date: Tue, 5 Jan 2016 15:45:02 +0330 Subject: [PATCH 3/3] Fix uint compile error --- drivers/jpegd/image_loader_jpegd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/jpegd/image_loader_jpegd.cpp b/drivers/jpegd/image_loader_jpegd.cpp index 4805cf4d5d9..9d1263b81bd 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;