diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-17 14:04:01 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-17 14:04:47 +0400 |
| commit | ad2064ae88eabead6e6fe80999f448087ad186cd (patch) | |
| tree | e68d2cae4973762abf1cb3b05eea6bbe3eeef008 /source/blender/freestyle/intern/stroke | |
| parent | a1cab0d38d178895127ba8d5160c8282938a2467 (diff) | |
Fix compilation error of Freestyle
Seems to be some sort of namespace conflict or so which is
solved by reshuffling the includes a bit.
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
5 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/stroke/Chain.cpp b/source/blender/freestyle/intern/stroke/Chain.cpp index c09ccbd393a..7fd756472b0 100644 --- a/source/blender/freestyle/intern/stroke/Chain.cpp +++ b/source/blender/freestyle/intern/stroke/Chain.cpp @@ -27,8 +27,8 @@ #include "Chain.h" -#include "../view_map/ViewMapAdvancedIterators.h" #include "../view_map/ViewMapIterators.h" +#include "../view_map/ViewMapAdvancedIterators.h" namespace Freestyle { diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp index 2b281a24962..32cfac016d6 100644 --- a/source/blender/freestyle/intern/stroke/Curve.cpp +++ b/source/blender/freestyle/intern/stroke/Curve.cpp @@ -26,8 +26,8 @@ */ #include "Curve.h" -#include "CurveAdvancedIterators.h" #include "CurveIterators.h" +#include "CurveAdvancedIterators.h" #include "BKE_global.h" #include "BLI_utildefines.h" diff --git a/source/blender/freestyle/intern/stroke/CurveIterators.h b/source/blender/freestyle/intern/stroke/CurveIterators.h index c1bec1e3b65..ff7b2d04385 100644 --- a/source/blender/freestyle/intern/stroke/CurveIterators.h +++ b/source/blender/freestyle/intern/stroke/CurveIterators.h @@ -43,7 +43,7 @@ namespace CurveInternal { class CurvePointIterator : public Interface0DIteratorNested { public: - friend class Curve; + friend class Freestyle::Curve; public: float _CurvilinearLength; diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp index 159e4a39849..86625e67405 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp @@ -26,8 +26,8 @@ */ #include "Stroke.h" -#include "StrokeAdvancedIterators.h" #include "StrokeIterators.h" +#include "StrokeAdvancedIterators.h" #include "StrokeRenderer.h" #include "BKE_global.h" diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp index fb6da853e02..1b9ab725ab9 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp @@ -26,8 +26,8 @@ */ #include "Stroke.h" -#include "StrokeAdvancedIterators.h" #include "StrokeIterators.h" +#include "StrokeAdvancedIterators.h" #include "StrokeRenderer.h" #include "StrokeRep.h" |