LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '12.0' into GraphicsBuffer

Browse Source
This commit is contained in:
Alex Szpakowski
2020-02-17 16:31:02 -04:00
parent 7a997fb21f 20e7b1745c
commit b1c028a4d3
77 changed files with 28811 additions and 9648 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/wrap_Mesh.cpp
+2 -10
View File
@@ -20,8 +20,7 @@
// LOVE
#include "wrap_Mesh.h"
#include "Image.h"
#include "Canvas.h"
#include "Texture.h"
#include "wrap_Texture.h"
// C++
@@ -615,14 +614,7 @@ int w_Mesh_getTexture(lua_State *L)
if (tex == nullptr)
return 0;
// FIXME: big hack right here.
if (dynamic_cast<Image *>(tex) != nullptr)
luax_pushtype(L, Image::type, tex);
else if (dynamic_cast<Canvas *>(tex) != nullptr)
luax_pushtype(L, Canvas::type, tex);
else
return luaL_error(L, "Unable to determine texture type.");
luax_pushtype(L, tex);
return 1;
}