From 34e6f8285a612cd1266415bde046cd3ae07321a7 Mon Sep 17 00:00:00 2001
From: clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c>
Date: Fri, 4 Dec 2009 21:38:48 +0000
Subject: Clifford Wolf: 	Fixed -D for -s

git-svn-id: http://svn.clifford.at/openscad/trunk@143 b57f626f-c46c-0410-a088-ec61d464b74c

diff --git a/openscad.cc b/openscad.cc
index 63904ee..92480dc 100644
--- a/openscad.cc
+++ b/openscad.cc
@@ -162,7 +162,7 @@ int main(int argc, char **argv)
 				text += buffer;
 			}
 			fclose(fp);
-			root_module = parse(text.toAscii().data(), false);
+			root_module = parse((text+commandline_commands).toAscii().data(), false);
 		}
 
 		QString original_path = QDir::currentPath();
-- 
cgit v0.10.1