Michel2/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad.git synced 2026-09-12 09:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge.

Browse Source
This commit is contained in:
leo
2014-12-23 17:02:23 +00:00
parent b3d8fafeb4
commit ffc58f554c
3 changed files with 26 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/project.cpp
+8 -6
View File
@@ -248,12 +248,6 @@ bool Project::Load(const QString& FileName)
{
Success = FileLoad(&file, false, false);
UpdateBackgroundTexture();
CalculateStep();
if (!bUndo)
ClearSelection(false);
if (!bMerge)
gMainWindow->UpdateFocusObject(GetFocusObject());
@@ -320,6 +314,14 @@ bool Project::Save(const QString& FileName)
return true;
}
void Project::Merge(Project* Other)
{
for (int ModelIdx = 0; ModelIdx < Other->mModels.GetSize(); ModelIdx++)
mModels.Add(Other->mModels[ModelIdx]);
mModified = true;
}
/*
void Project::LoadDefaults() // todo: Change the interface in SetProject() instead
{