Merge remote-tracking branch 'svn/trunk'

src/Gui/Macro.cpp

@@ -216,15 +216,18 @@ namespace Gui {
 
 void MacroManager::run(MacroType eType,const char *sName)
 {
-    try
-    {
+    try {
         PythonRedirector std_out("stdout",new OutputStdout);
         PythonRedirector std_err("stderr",new OutputStderr);
         //The given path name is expected to be Utf-8
         Base::Interpreter().runFile(sName, true);
     }
-    catch (const Base::Exception& e)
-    {
+    catch (const Base::SystemExitException&) {
+        Base::PyGILStateLocker lock;
+        PyErr_Clear();
+        Base::Interpreter().systemExit();
+    }
+    catch (const Base::Exception& e) {
         qWarning("%s",e.what());
     }
 }

src/Gui/SoFCUnifiedSelection.cpp

@@ -169,6 +169,20 @@ const char* SoFCUnifiedSelection::getFileFormatName(void) const
     return "Separator";
 }
 
+void SoFCUnifiedSelection::write(SoWriteAction * action)
+{
+    SoOutput * out = action->getOutput();
+    if (out->getStage() == SoOutput::WRITE) {
+        // Do not write out the fields of this class
+        if (this->writeHeader(out, TRUE, FALSE)) return;
+        SoGroup::doAction((SoAction *)action);
+        this->writeFooter(out);
+    }
+    else {
+        inherited::write(action);
+    }
+}
+
 int SoFCUnifiedSelection::getPriority(const SoPickedPoint* p)
 {
     const SoDetail* detail = p->getDetail();

src/Gui/SoFCUnifiedSelection.h

@@ -72,6 +72,7 @@ public:
     };
 
     const char* getFileFormatName(void) const;
+    void write(SoWriteAction * action);
 
     SoSFColor colorHighlight;
     SoSFColor colorSelection;