Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta

# Conflicts:
#	tclCommands/TclCommandMillDrills.py
This commit is contained in:
Marius Stanciu
2019-11-19 23:20:09 +02:00
committed by Marius
5 changed files with 6 additions and 7 deletions

View File

@@ -48,7 +48,7 @@ class TclCommandOpenGerber(TclCommandSignaled):
# How the object should be initialized
def obj_init(gerber_obj, app_obj):
if not isinstance(gerber_obj, Geometry):
if not isinstance(gerber_obj, FlatCAMGerber):
self.raise_tcl_error('Expected FlatCAMGerber, got %s %s.' % (outname, type(gerber_obj)))
# Opening the file happens here