Merge remote-tracking branch 'svn/trunk'

This commit is contained in:
jriegel
2012-01-30 08:04:37 +01:00
5 changed files with 19 additions and 14 deletions

View File

@@ -1441,6 +1441,13 @@ void SketchObject::onDocumentRestored()
}
}
void SketchObject::onFinishDuplicating()
{
Constraints.acceptGeometry(getCompleteGeometry());
rebuildVertexIndex();
onDocumentRestored();
}
void SketchObject::getGeoVertexIndex(int VertexId, int &GeoId, PointPos &PosId)
{
if (VertexId < 0 || VertexId >= int(VertexId2GeoId.size())) {

View File

@@ -152,6 +152,7 @@ protected:
/// get called by the container when a property has changed
virtual void onChanged(const App::Property* /*prop*/);
virtual void onDocumentRestored();
virtual void onFinishDuplicating();
private:
std::vector<Part::Geometry *> ExternalGeo;