asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/godotengine/godot

Browse source
This commit is contained in:
Juan Linietsky 2016-01-05 10:38:13 -03:00
commit afaa57be30
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/jpegd/image_loader_jpegd.cpp
View file

@ -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;

3
platform/windows/joystick.h
View file

@ -44,6 +44,9 @@ if(x != NULL) \
}
#endif
#ifndef XUSER_MAX_COUNT
#define XUSER_MAX_COUNT 4
#endif
class joystick_windows
{

2
tools/export/blender25/io_scene_dae/export_dae.py
View file

@ -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.')