[Bf-blender-cvs] [4219e44] master: Freestyle: removed unnecessary #include "FreestyleConfig.h".
Tamito Kajiyama
noreply at git.blender.org
Thu Apr 17 07:37:44 CEST 2014
Commit: 4219e44f1d89cfd6ccdf3adc0fd73e22ae7b6df3
Author: Tamito Kajiyama
Date: Thu Apr 17 14:31:35 2014 +0900
https://developer.blender.org/rB4219e44f1d89cfd6ccdf3adc0fd73e22ae7b6df3
Freestyle: removed unnecessary #include "FreestyleConfig.h".
===================================================================
M source/blender/freestyle/intern/application/AppConfig.cpp
M source/blender/freestyle/intern/application/AppConfig.h
M source/blender/freestyle/intern/system/BaseObject.h
M source/blender/freestyle/intern/system/Exception.h
M source/blender/freestyle/intern/system/PseudoNoise.h
M source/blender/freestyle/intern/system/RandGen.h
M source/blender/freestyle/intern/system/StringUtils.h
M source/blender/freestyle/intern/system/TimeStamp.h
M source/blender/freestyle/intern/system/TimeUtils.h
===================================================================
diff --git a/source/blender/freestyle/intern/application/AppConfig.cpp b/source/blender/freestyle/intern/application/AppConfig.cpp
index 967cb40..cf7959f 100644
--- a/source/blender/freestyle/intern/application/AppConfig.cpp
+++ b/source/blender/freestyle/intern/application/AppConfig.cpp
@@ -25,6 +25,7 @@
#include "AppConfig.h"
#include <iostream>
+#include "../system/FreestyleConfig.h"
#include "../system/StringUtils.h"
using namespace std;
diff --git a/source/blender/freestyle/intern/application/AppConfig.h b/source/blender/freestyle/intern/application/AppConfig.h
index 94ae0c3..ae1d96e 100644
--- a/source/blender/freestyle/intern/application/AppConfig.h
+++ b/source/blender/freestyle/intern/application/AppConfig.h
@@ -30,7 +30,6 @@
#include <string>
#include <algorithm>
-#include "../system/FreestyleConfig.h"
#include "../system/Precision.h"
#ifdef WITH_CXX_GUARDEDALLOC
diff --git a/source/blender/freestyle/intern/system/BaseObject.h b/source/blender/freestyle/intern/system/BaseObject.h
index 6043014..8cabd91 100644
--- a/source/blender/freestyle/intern/system/BaseObject.h
+++ b/source/blender/freestyle/intern/system/BaseObject.h
@@ -29,8 +29,6 @@
* \date 06/02/2002
*/
-#include "FreestyleConfig.h"
-
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
diff --git a/source/blender/freestyle/intern/system/Exception.h b/source/blender/freestyle/intern/system/Exception.h
index 2111988..f605735 100644
--- a/source/blender/freestyle/intern/system/Exception.h
+++ b/source/blender/freestyle/intern/system/Exception.h
@@ -28,8 +28,6 @@
* \date 10/01/2003
*/
-#include "FreestyleConfig.h"
-
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
diff --git a/source/blender/freestyle/intern/system/PseudoNoise.h b/source/blender/freestyle/intern/system/PseudoNoise.h
index b0164a7..602ad52 100644
--- a/source/blender/freestyle/intern/system/PseudoNoise.h
+++ b/source/blender/freestyle/intern/system/PseudoNoise.h
@@ -28,7 +28,6 @@
* \date 16/06/2003
*/
-#include "FreestyleConfig.h"
#include "Precision.h"
#ifdef WITH_CXX_GUARDEDALLOC
diff --git a/source/blender/freestyle/intern/system/RandGen.h b/source/blender/freestyle/intern/system/RandGen.h
index 7621601..d39b4f9 100644
--- a/source/blender/freestyle/intern/system/RandGen.h
+++ b/source/blender/freestyle/intern/system/RandGen.h
@@ -30,8 +30,6 @@
// TODO Check whether we could replace this with BLI rand stuff...
-#include "FreestyleConfig.h"
-
#include "../system/Precision.h"
#ifdef WITH_CXX_GUARDEDALLOC
diff --git a/source/blender/freestyle/intern/system/StringUtils.h b/source/blender/freestyle/intern/system/StringUtils.h
index 9aa2677..77b543c 100644
--- a/source/blender/freestyle/intern/system/StringUtils.h
+++ b/source/blender/freestyle/intern/system/StringUtils.h
@@ -34,15 +34,9 @@
#include <string>
#include <vector>
-#include "FreestyleConfig.h"
-
-//soc
extern "C" {
-
#include "BKE_utildefines.h"
-
#include "BLI_blenlib.h"
-
}
using namespace std;
diff --git a/source/blender/freestyle/intern/system/TimeStamp.h b/source/blender/freestyle/intern/system/TimeStamp.h
index c2b4563..ccf370a 100644
--- a/source/blender/freestyle/intern/system/TimeStamp.h
+++ b/source/blender/freestyle/intern/system/TimeStamp.h
@@ -28,8 +28,6 @@
* \date 12/12/2002
*/
-#include "FreestyleConfig.h"
-
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
diff --git a/source/blender/freestyle/intern/system/TimeUtils.h b/source/blender/freestyle/intern/system/TimeUtils.h
index 6fe8b0e..2d14adc 100644
--- a/source/blender/freestyle/intern/system/TimeUtils.h
+++ b/source/blender/freestyle/intern/system/TimeUtils.h
@@ -30,8 +30,6 @@
#include <time.h>
-#include "FreestyleConfig.h"
-
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
More information about the Bf-blender-cvs
mailing list