diff options
Diffstat (limited to 'source/blender/freestyle/intern')
-rw-r--r-- | source/blender/freestyle/intern/geometry/SweepLine.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h index df73df155c4..ec81507c5c6 100644 --- a/source/blender/freestyle/intern/geometry/SweepLine.h +++ b/source/blender/freestyle/intern/geometry/SweepLine.h @@ -81,6 +81,10 @@ public: real tB; // parameter defining the intersection point with respect to the segment EdgeB. }; +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable: 4521) // disable warning C4521: multiple copy constructors specified +#endif template<class T, class Point> class Segment @@ -183,6 +187,10 @@ private: bool _order; // true if A and B are in the same order than _edge.A and _edge.B. false otherwise. }; +#ifdef _MSC_VER +#pragma warning(pop) +#endif + /*! defines a binary function that can be overload by the user to specify at each condition the intersection * between 2 edges must be computed */ |