[varLib/VarComposite] Plug in in a couple places

This commit is contained in:
Behdad Esfahbod 2023-01-17 17:29:36 -07:00
parent d32650b58d
commit 0d24114ad0
2 changed files with 2 additions and 2 deletions

View File

@ -541,7 +541,7 @@ def instantiateGvar(varfont, axisLimits, optimize=True):
glyf.glyphOrder,
key=lambda name: (
glyf[name].getCompositeMaxpValues(glyf).maxComponentDepth
if glyf[name].isComposite()
if glyf[name].isComposite() or glyf[name].isVarComposite()
else 0,
name,
),

View File

@ -199,7 +199,7 @@ def instantiateVariableFont(varfont, location, inplace=False, overlap=True):
gvar.variations.keys(),
key=lambda name: (
glyf[name].getCompositeMaxpValues(glyf).maxComponentDepth
if glyf[name].isComposite()
if glyf[name].isComposite() or glyf[name].isVarComposite()
else 0,
name,
),