[varLib.mutator] Merge with master head.

Lib/fontTools/varLib/mutator.py

@@ -149,7 +149,8 @@ def instantiateVariableFont(varfont, location, inplace=False):
 					delta = iup_delta(delta, origCoords, endPts)
 				coordinates += GlyphCoordinates(delta) * scalar
 			_SetCoordinates(varfont, glyphname, coordinates)
-
+	else:
+		glyf = None
 	if 'cvar' in varfont:
 		log.info("Mutating cvt/cvar tables")
 		cvar = varfont['cvar']
@@ -246,6 +247,7 @@ def instantiateVariableFont(varfont, location, inplace=False):
 
 
 	addidef = False
+	if glyf:
 		for glyph in glyf.glyphs.values():
 			if hasattr(glyph, "program"):
 				instructions = glyph.program.getAssembly()