Fix build error on Windows without precompiled headers

Recent refactoring to use uint relied on indirect includes and precompiled
headers for uint to be defined. Explicitly include BLI_sys_types where this
type is used now.
This commit is contained in:
Brecht Van Lommel 2022-10-26 18:58:04 +02:00
parent bc7de854c9
commit 1840f44666
57 changed files with 114 additions and 1 deletions

View File

@ -12,6 +12,8 @@
#include "FitCurve.h"
#include "BLI_sys_types.h"
using namespace std;
namespace Freestyle {

View File

@ -25,6 +25,8 @@
#include "BKE_global.h"
#include "BLI_sys_types.h"
using namespace std;
namespace Freestyle {

View File

@ -7,6 +7,8 @@
#include "GeomUtils.h"
#include "BLI_sys_types.h"
namespace Freestyle::GeomUtils {
// This internal procedure is defined below.

View File

@ -7,6 +7,8 @@
#include "HashGrid.h"
#include "BLI_sys_types.h"
namespace Freestyle {
void HashGrid::clear()

View File

@ -12,6 +12,7 @@
#include "BLI_compiler_attrs.h"
#include "BLI_rand.h"
#include "BLI_sys_types.h"
#include "Noise.h"

View File

@ -11,6 +11,8 @@
#include "Image.h"
#include "ImagePyramid.h"
#include "BLI_sys_types.h"
using namespace std;
namespace Freestyle {

View File

@ -9,6 +9,8 @@
#include "../stroke/ContextFunctions.h"
#include "BLI_sys_types.h"
using namespace Freestyle;
#ifdef __cplusplus

View File

@ -9,6 +9,8 @@
#include "../system/RandGen.h"
#include "BLI_sys_types.h"
#include <sstream>
#ifdef __cplusplus

View File

@ -12,6 +12,8 @@
#include "UnaryFunction0D/BPy_UnaryFunction0DFloat.h"
#include "UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -16,6 +16,8 @@
#include "UnaryFunction0D/BPy_UnaryFunction0DDouble.h"
#include "UnaryFunction1D/BPy_UnaryFunction1DVoid.h"
#include "BLI_sys_types.h"
#include <sstream>
#ifdef __cplusplus

View File

@ -12,6 +12,8 @@
#include "Interface0D/BPy_SVertex.h"
#include "Interface1D/BPy_FEdge.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -11,6 +11,8 @@
#include "Interface0D/BPy_ViewVertex.h"
#include "Interface1D/BPy_ViewEdge.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -42,6 +42,8 @@
#include "UnaryFunction1D/BPy_UnaryFunction1DVec3f.h"
#include "UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h"
#include "BLI_sys_types.h"
using namespace Freestyle;
// BinaryPredicate0D: __call__

View File

@ -10,6 +10,8 @@
#include "../BPy_Id.h"
#include "../Interface1D/BPy_FEdge.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -13,6 +13,8 @@
#include "../Interface0D/CurvePoint/BPy_StrokeVertex.h"
#include "../Iterator/BPy_StrokeVertexIterator.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -9,6 +9,8 @@
#include "../../BPy_Convert.h"
#include "../../Interface0D/BPy_SVertex.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -9,6 +9,8 @@
#include "../../BPy_Convert.h"
#include "../../Interface0D/BPy_SVertex.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -11,6 +11,8 @@
#include "UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -11,6 +11,8 @@
#include "UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -8,6 +8,8 @@
#include "../../../stroke/AdvancedFunctions0D.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -12,6 +12,8 @@
#include "UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -14,6 +14,8 @@
#include "UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h"
#include "UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -10,6 +10,8 @@
#include "../../BPy_Convert.h"
#include "../../BPy_IntegrationType.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -6,6 +6,8 @@
#include "BPy_EqualToChainingTimeStampUP1D.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -6,6 +6,8 @@
#include "BPy_EqualToTimeStampUP1D.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -6,6 +6,8 @@
#include "BPy_ShapeUP1D.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -7,6 +7,8 @@
#include "IndexedFaceSet.h"
#include "BLI_sys_types.h"
namespace Freestyle {
IndexedFaceSet::IndexedFaceSet()

View File

@ -9,6 +9,7 @@
#include "NodeTransform.h"
#include "BLI_math.h"
#include "BLI_sys_types.h"
namespace Freestyle {

View File

@ -6,6 +6,8 @@
#include "SceneHash.h"
#include "BLI_sys_types.h"
#include <sstream>
namespace Freestyle {

View File

@ -10,6 +10,8 @@
#include "IndexedFaceSet.h"
#include "ScenePrettyPrinter.h"
#include "BLI_sys_types.h"
namespace Freestyle {
#define VISIT(CLASS) \

View File

@ -10,6 +10,8 @@
#include "../view_map/SteerableViewMap.h"
#include "BLI_sys_types.h"
namespace Freestyle::Functions1D {
int GetSteerableViewMapDensityF1D::operator()(Interface1D &inter)

View File

@ -11,6 +11,8 @@
#include "../system/PseudoNoise.h"
#include "../system/RandGen.h"
#include "BLI_sys_types.h"
namespace Freestyle {
/////////////////////////////////////////

View File

@ -23,6 +23,8 @@
#include "BKE_global.h"
#include "BLI_sys_types.h"
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"

View File

@ -22,6 +22,8 @@
#include "../view_map/SteerableViewMap.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
// soc #include <qimage.h>

View File

@ -12,6 +12,8 @@
#include "../system/TimeStamp.h"
#include "BLI_sys_types.h"
namespace Freestyle::ContextFunctions {
uint GetTimeStampCF()

View File

@ -14,6 +14,8 @@
#include "Stroke.h"
#include "StrokeIterators.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
namespace Freestyle {

View File

@ -9,6 +9,8 @@
#include "../geometry/GeomUtils.h"
#include "BLI_sys_types.h"
using namespace std;
namespace Freestyle {

View File

@ -10,6 +10,8 @@
#include "StringUtils.h"
#include "FreestyleConfig.h"
#include "BLI_sys_types.h"
namespace Freestyle::StringUtils {
void getPathName(const string &path, const string &base, vector<string> &pathnames)

View File

@ -7,6 +7,8 @@
#include "ArbitraryGridDensityProvider.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
namespace Freestyle {

View File

@ -7,6 +7,8 @@
#include "AverageAreaGridDensityProvider.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
namespace Freestyle {

View File

@ -10,6 +10,8 @@
#include "BoxGrid.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
using namespace std;

View File

@ -9,6 +9,8 @@
#include "../geometry/GridHelpers.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
namespace Freestyle {

View File

@ -12,6 +12,8 @@
#include "../geometry/GeomUtils.h"
#include "../geometry/normal_cycle.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
namespace Freestyle {

View File

@ -8,6 +8,8 @@
#include "Functions0D.h"
#include "ViewMap.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
using namespace std;

View File

@ -7,6 +7,8 @@
#include "HeuristicGridDensityProviderFactory.h"
#include "BLI_sys_types.h"
namespace Freestyle {
HeuristicGridDensityProviderFactory::HeuristicGridDensityProviderFactory(real sizeFactor,

View File

@ -9,6 +9,8 @@
#include "OccluderSource.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
namespace Freestyle {

View File

@ -7,6 +7,8 @@
#include "Pow23GridDensityProvider.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
namespace Freestyle {

View File

@ -14,6 +14,8 @@
#include "../geometry/GeomUtils.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
using namespace std;

View File

@ -10,6 +10,8 @@
#include "SphericalGrid.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
using namespace std;

View File

@ -16,8 +16,10 @@
#include "../image/Image.h"
#include "../image/ImagePyramid.h"
#include "BKE_global.h"
#include "BLI_math.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"

View File

@ -13,6 +13,8 @@
#include "../winged_edge/WXEdge.h"
#include "BLI_sys_types.h"
using namespace std;
namespace Freestyle {

View File

@ -13,6 +13,8 @@
#include "../geometry/GeomUtils.h"
#include "BLI_sys_types.h"
namespace Freestyle {
/**********************************/

View File

@ -24,6 +24,8 @@
#include "../winged_edge/WFillGrid.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
namespace Freestyle {

View File

@ -9,6 +9,8 @@
#include "WEdge.h"
#include "BLI_sys_types.h"
namespace Freestyle {
/** Temporary structures */

View File

@ -6,6 +6,9 @@
*/
#include "WXEdge.h"
#include "BLI_sys_types.h"
#include "BKE_global.h"
namespace Freestyle {

View File

@ -9,6 +9,8 @@
#include "WXEdgeBuilder.h"
#include "WXEdge.h"
#include "BLI_sys_types.h"
namespace Freestyle {
void WXEdgeBuilder::visitIndexedFaceSet(IndexedFaceSet &ifs)

View File

@ -14,6 +14,8 @@
#include "../scene_graph/NodeShape.h"
#include "BLI_sys_types.h"
using namespace std;
namespace Freestyle {