From e59e5e5be40e9c7ebae7155bf819f280e405e9de Mon Sep 17 00:00:00 2001 From: Sebastian Hoogen Date: Mon, 28 Oct 2013 06:36:27 +0100 Subject: [PATCH] bugfix in OpenSCADUtils.callopenscad() it did not return any result if outputfilename was given reported by Keith Sloan --- src/Mod/OpenSCAD/OpenSCADUtils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mod/OpenSCAD/OpenSCADUtils.py b/src/Mod/OpenSCAD/OpenSCADUtils.py index e395b56207..7c1437e959 100644 --- a/src/Mod/OpenSCAD/OpenSCADUtils.py +++ b/src/Mod/OpenSCAD/OpenSCADUtils.py @@ -109,9 +109,9 @@ def callopenscad(inputfilename,outputfilename=None,outputext='csg',keepname=Fals else: outputfilename=os.path.join(dir1,'output-%d.%s' % \ (int(time.time()*100) % 1000000,outputext)) - check_output2([osfilename,'-o',outputfilename, inputfilename],\ - stderr=subprocess.STDOUT) - return outputfilename + check_output2([osfilename,'-o',outputfilename, inputfilename],\ + stderr=subprocess.STDOUT) + return outputfilename def callopenscadstring(scadstr,outputext='csg'): '''create a tempfile and call the open scad binary