From 7c15affce6df5a17a72435b2eae8ada11d7beca0 Mon Sep 17 00:00:00 2001 From: Ajinkya Dahale Date: Fri, 31 May 2024 16:57:45 +0530 Subject: [PATCH] [Sketcher] Rearrange directives to appease syntax highlight Spacemacs doesn't handle the braces flow very well. This commit can be dropped if necessary. --- src/Mod/Sketcher/App/SketchObject.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index c595c57d8b..34f7bdaea9 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -260,25 +260,28 @@ void SketchObject::buildShape() ++i; if(GeometryFacade::getConstruction(geo)) continue; - if (geo->isDerivedFrom(Part::GeomPoint::getClassTypeId())) { + if (geo->isDerivedFrom()) #ifdef FC_USE_TNP_FIX + { Part::TopoShape vertex(TopoDS::Vertex(geo->toShape())); int idx = getVertexIndexGeoPos(i-1, Sketcher::PointPos::start); std::string name = convertSubName(Data::IndexedName::fromConst("Vertex", idx+1), false); vertices.push_back(vertex); vertices.back().copyElementMap(vertex, Part::OpCodes::Sketch); - } else { + } + else { auto indexedName = Data::IndexedName::fromConst("Edge", i); shapes.push_back(getEdge(geo,convertSubName(indexedName, false).c_str())); } #else + { vertices.emplace_back(TopoDS::Vertex(geo->toShape())); int idx = getVertexIndexGeoPos(i-1, PointPos::start); std::string name = convertSubName(Data::IndexedName::fromConst("Vertex", idx+1), false); - - } else + } + else shapes.push_back(getEdge(geo,convertSubName( Data::IndexedName::fromConst("Edge", i), false).c_str())); #endif