From 30b083bd23857170b45243ef823ba0cb23c4bd52 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 15 May 2015 14:45:11 -0300 Subject: [PATCH] Fixed the new love.graphics.newMesh variant that accepts a Data object. --- src/modules/graphics/opengl/wrap_Graphics.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp index f3a31704c..055f7a5f2 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.cpp +++ b/src/modules/graphics/opengl/wrap_Graphics.cpp @@ -784,13 +784,14 @@ static Mesh *newCustomMesh(lua_State *L) int w_newMesh(lua_State *L) { // Check first argument: table or number of vertices. - int ttype = lua_type(L, 1); - if (ttype != LUA_TTABLE && ttype != LUA_TNUMBER) + int arg1type = lua_type(L, 1); + if (arg1type != LUA_TTABLE && arg1type != LUA_TNUMBER) luaL_argerror(L, 1, "table or number expected"); Mesh *t = nullptr; - if (ttype == LUA_TTABLE && (lua_istable(L, 2) || lua_type(L, 2) == LUA_TNUMBER)) + int arg2type = lua_type(L, 2); + if (arg1type == LUA_TTABLE && (arg2type == LUA_TTABLE || arg2type == LUA_TNUMBER || arg2type == LUA_TUSERDATA)) t = newCustomMesh(L); else t = newStandardMesh(L);