Allow for odd shaped platforms and generalize the UM2 clip code into no-go zones.

[cura.git] / Cura / cura.py

diff --git a/Cura/cura.py b/Cura/cura.py
index 7c847c38a0a9196aa537a5757ff2227ac7d2a268..701b93e64a07834705a376e8064308475f21e3fd 100644 (file)
--- a/Cura/cura.py
+++ b/Cura/cura.py
@@ -30,7 +30,7 @@ def main():
 
        profile.loadPreferences(profile.getPreferencePath())
        if options.profile is not None:
-               profile.loadProfileFromString(options.profile)
+               profile.setProfileFromString(options.profile)
        elif options.profileini is not None:
                profile.loadProfile(options.profileini)
        else:
@@ -54,6 +54,7 @@ def main():
                        scene.add(m)
                slicer.runSlicer(scene)
                slicer.wait()
+               profile.replaceGCodeTagsFromSlicer(slicer.getGCodeFilename(), slicer)
 
                if options.output:
                        shutil.copyfile(slicer.getGCodeFilename(), options.output)