Skip to content

Commit

Permalink
Merge branch 'main' into 12.0-development
Browse files Browse the repository at this point in the history
  • Loading branch information
slime73 committed Oct 12, 2023
2 parents 86eb6df + ba69350 commit 37b9d7d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Documentation
-------------

We use our [wiki][wiki] for documentation.
If you need further help, feel free to ask on our [forums][forums], our [Discord server][discord], or our IRC channel [#love on OFTC][irc].
If you need further help, feel free to ask on our [forums][forums], our [Discord server][discord], or our [subreddit][subreddit].

Repository
----------
Expand Down Expand Up @@ -97,7 +97,7 @@ Dependencies
[wiki]: https://love2d.org/wiki
[forums]: https://love2d.org/forums
[discord]: https://discord.gg/rhUets9
[irc]: irc://irc.oftc.net/love
[subreddit]: https://www.reddit.com/r/love2d
[dependencies-apple]: https://github.com/love2d/love-apple-dependencies
[dependencies-ios]: https://github.com/love2d/love/releases
[megasource]: https://github.com/love2d/megasource
Expand Down
2 changes: 1 addition & 1 deletion src/modules/font/wrap_Font.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ int w_newBMFontRasterizer(lua_State *L)
lua_pop(L, 1);
}
}
else
else if (!lua_isnoneornil(L, 2))
{
convimagedata(L, 2);
image::ImageData *id = luax_checktype<image::ImageData>(L, 2);
Expand Down

0 comments on commit 37b9d7d

Please sign in to comment.