Merge branch 'main' into 12.0-development

readme.md

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

src/modules/font/wrap_Font.cpp

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