mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop
This commit is contained in:
@@ -669,7 +669,7 @@ bool jsval_to_TTFConfig(JSContext *cx, JS::HandleValue v, cocos2d::TTFConfig* re
|
||||
if (JS_GetProperty(cx, tmp, "glyphs", &js_glyphs) && !js_glyphs.isUndefined())
|
||||
{
|
||||
if (JS::ToNumber(cx, js_glyphs, &glyphs))
|
||||
ret->glyphs = (GlyphCollection)glyphs;
|
||||
ret->glyphs = (GlyphCollection)((int)glyphs);
|
||||
}
|
||||
|
||||
if (JS_GetProperty(cx, tmp, "customGlyphs", &js_customGlyphs) && !js_customGlyphs.isUndefined())
|
||||
|
||||
Reference in New Issue
Block a user