Fix compilation error of Freestyle

Seems to be some sort of namespace conflict or so which is
solved by reshuffling the includes a bit.
This commit is contained in:
2014-04-17 16:04:01 +06:00
parent a1cab0d38d
commit ad2064ae88
9 changed files with 12 additions and 6 deletions

View File

@@ -25,6 +25,8 @@
* \date 30/07/2002
*/
#include <cstdlib>
#include "FastGrid.h"
#include "BKE_global.h"

View File

@@ -27,8 +27,8 @@
#include "Chain.h"
#include "../view_map/ViewMapAdvancedIterators.h"
#include "../view_map/ViewMapIterators.h"
#include "../view_map/ViewMapAdvancedIterators.h"
namespace Freestyle {

View File

@@ -26,8 +26,8 @@
*/
#include "Curve.h"
#include "CurveAdvancedIterators.h"
#include "CurveIterators.h"
#include "CurveAdvancedIterators.h"
#include "BKE_global.h"
#include "BLI_utildefines.h"

View File

@@ -43,7 +43,7 @@ namespace CurveInternal {
class CurvePointIterator : public Interface0DIteratorNested
{
public:
friend class Curve;
friend class Freestyle::Curve;
public:
float _CurvilinearLength;

View File

@@ -26,8 +26,8 @@
*/
#include "Stroke.h"
#include "StrokeAdvancedIterators.h"
#include "StrokeIterators.h"
#include "StrokeAdvancedIterators.h"
#include "StrokeRenderer.h"
#include "BKE_global.h"

View File

@@ -26,8 +26,8 @@
*/
#include "Stroke.h"
#include "StrokeAdvancedIterators.h"
#include "StrokeIterators.h"
#include "StrokeAdvancedIterators.h"
#include "StrokeRenderer.h"
#include "StrokeRep.h"

View File

@@ -26,6 +26,8 @@
* \date 03/09/2002
*/
#include <cstring>
#include "Silhouette.h"
#include "SilhouetteGeomEngine.h"

View File

@@ -28,8 +28,8 @@
#include <float.h>
#include "ViewMap.h"
#include "ViewMapAdvancedIterators.h"
#include "ViewMapIterators.h"
#include "ViewMapAdvancedIterators.h"
#include "../geometry/GeomUtils.h"

View File

@@ -25,6 +25,8 @@
* \date 09/01/2003
*/
#include <limits.h>
#include "ViewMapIO.h"
#ifdef IRIX