suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve minor merge conflict

Browse Source
This commit is contained in:
WandererFan 2016-11-05 12:41:36 -04:00
parent 256c5ed198
commit 4f511f663a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/TechDraw/App/DrawViewMulti.cpp
View File

@ -81,6 +81,8 @@ DrawViewMulti::DrawViewMulti()
//Source is replaced by Sources in Multi //Source is replaced by Sources in Multi
Source.setStatus(App::Property::ReadOnly,true); Source.setStatus(App::Property::ReadOnly,true);
geometryObject = nullptr;
} }
DrawViewMulti::~DrawViewMulti() DrawViewMulti::~DrawViewMulti()
@ -137,9 +139,6 @@ App::DocumentObjectExecReturn *DrawViewMulti::execute(void)
} }
m_compound = comp; m_compound = comp;
geometryObject->setTolerance(Tolerance.getValue());
geometryObject->setScale(Scale.getValue());
gp_Pnt inputCenter; gp_Pnt inputCenter;
try { try {
inputCenter = TechDrawGeometry::findCentroid(comp, inputCenter = TechDrawGeometry::findCentroid(comp,
@ -147,7 +146,7 @@ App::DocumentObjectExecReturn *DrawViewMulti::execute(void)
TopoDS_Shape mirroredShape = TechDrawGeometry::mirrorShape(comp, TopoDS_Shape mirroredShape = TechDrawGeometry::mirrorShape(comp,
inputCenter, inputCenter,
Scale.getValue()); Scale.getValue());
buildGeometryObject(mirroredShape,inputCenter); geometryObject = buildGeometryObject(mirroredShape,inputCenter);
#if MOD_TECHDRAW_HANDLE_FACES #if MOD_TECHDRAW_HANDLE_FACES
extractFaces(); extractFaces();