Commit ac1c0d8f authored by Lamar Moore's avatar Lamar Moore
Browse files

fix remaining merge issues #21230

parent ff22421e
......@@ -9,7 +9,7 @@ class TopoDS_Shape;
namespace Mantid {
namespace Geometry {
class Object;
class CSGObject;
namespace detail {
/** GeometryTriangulator : Triangulates object surfaces. May or may not use
......@@ -47,7 +47,7 @@ private:
void checkTriangulated();
public:
GeometryTriangulator(const Object *obj);
GeometryTriangulator(const CSGObject *obj);
~GeometryTriangulator();
void triangulate();
void setGeometryCache(size_t nPoints, size_t nFaces,
......
#include "MantidGeometry/Rendering/GeometryHandler.h"
#include "MantidGeometry/Instrument/RectangularDetector.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Rendering/GeometryTriangulator.h"
#include "MantidGeometry/Rendering/Renderer.h"
#include <boost/make_shared.hpp>
......
#include "MantidGeometry/Rendering/GeometryTriangulator.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Objects/Rules.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/WarningSuppressions.h"
......@@ -57,7 +57,7 @@ namespace {
Kernel::Logger g_log("GeometryTriangulator");
} // namespace
GeometryTriangulator::GeometryTriangulator(const Object *obj)
GeometryTriangulator::GeometryTriangulator(const CSGObject *obj)
: m_isTriangulated(false), m_nFaces(0), m_nPoints(0) {
m_obj = obj;
#ifdef ENABLE_OPENCASCADE
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment