+ make 'Merge project' undo/redoable
This commit is contained in:
parent
ea1f8395b9
commit
7b925d11aa
|
@ -4,7 +4,7 @@ set(FREECAD_VERSION "0.16")
|
|||
set(PACKAGE_NAME "FreeCAD")
|
||||
set(PACKAGE_VERSION_MAJOR "0")
|
||||
set(PACKAGE_VERSION_MINOR "16")
|
||||
set(PACKAGE_VERSION_PATCH "6699")
|
||||
set(PACKAGE_VERSION_PATCH "6700")
|
||||
set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
|
||||
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
|
||||
|
||||
|
|
|
@ -333,10 +333,13 @@ void StdCmdMergeProjects::activated(int iMsg)
|
|||
return;
|
||||
}
|
||||
|
||||
doc->openTransaction("Merge project");
|
||||
Base::FileInfo fi((const char*)project.toUtf8());
|
||||
Base::ifstream str(fi, std::ios::in | std::ios::binary);
|
||||
MergeDocuments md(doc);
|
||||
md.importObjects(str);
|
||||
str.close();
|
||||
doc->commitTransaction();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user