From 617557b08ea94e2b65a1697ddf0b79651204d92b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 1 Apr 2014 11:34:00 +1100 Subject: Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define --- .../freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 2 +- source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h | 2 +- source/blender/freestyle/intern/stroke/Operators.cpp | 6 +++--- source/blender/freestyle/intern/view_map/BoxGrid.h | 2 +- source/blender/freestyle/intern/view_map/SphericalGrid.h | 2 +- source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp | 2 +- source/blender/freestyle/intern/winged_edge/Curvature.cpp | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source/blender/freestyle') diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index b25996031c0..760c5c93455 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -444,7 +444,7 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const } } // loop over strip vertices #if 0 - BKE_mesh_validate(mesh, TRUE); + BKE_mesh_validate(mesh, true); #endif } // loop over strips } diff --git a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h index 7e8c6635953..d3329693a06 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h +++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h @@ -69,7 +69,7 @@ public: _DrawingStyle.setPointSize(iPointSize); } - /*! Enables or disables the lighting. TRUE = enable */ + /*! Enables or disables the lighting. true = enable */ inline void setLightingEnabled(const bool iEnableLighting) { _DrawingStyle.setLightingEnabled(iEnableLighting); diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index 1ad8901fa7b..eed3c913057 100644 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -106,7 +106,7 @@ int Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it, UnaryPredicate1D& p Chain *new_chain = new Chain(id); ++id; - while (TRUE) { + while (true) { new_chain->push_viewedge_back(*it, it.getOrientation()); if (modifier(**it) < 0) { delete new_chain; @@ -172,7 +172,7 @@ int Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it, UnaryPredicate1D& p Chain *new_chain = new Chain(id); ++id; - while (TRUE) { + while (true) { new_chain->push_viewedge_back(*it, it.getOrientation()); ts(**it); ++it; @@ -349,7 +349,7 @@ int Operators::bidirectionalChain(ChainingIterator& it, UnaryPredicate1D& pred) ViewEdgeIterator it_back(it); --it_back; #endif - while (TRUE) { + while (true) { new_chain->push_viewedge_back(*it, it.getOrientation()); ts(**it); if (it.increment() < 0) { diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.h b/source/blender/freestyle/intern/view_map/BoxGrid.h index 92f886ef429..a03924cf893 100644 --- a/source/blender/freestyle/intern/view_map/BoxGrid.h +++ b/source/blender/freestyle/intern/view_map/BoxGrid.h @@ -28,7 +28,7 @@ * \date 2011-1-29 */ -#define BOX_GRID_LOGGING FALSE +#define BOX_GRID_LOGGING false // I would like to avoid using deque because including ViewMap.h and or // separately results in redefinitions of identifiers. ViewMap.h already includes diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.h b/source/blender/freestyle/intern/view_map/SphericalGrid.h index 050dcc4c882..915398af02f 100644 --- a/source/blender/freestyle/intern/view_map/SphericalGrid.h +++ b/source/blender/freestyle/intern/view_map/SphericalGrid.h @@ -28,7 +28,7 @@ * \date 2010-12-19 */ -#define SPHERICAL_GRID_LOGGING FALSE +#define SPHERICAL_GRID_LOGGING false // I would like to avoid using deque because including ViewMap.h and or separately results in // redefinitions of identifiers. ViewMap.h already includes so it should be a safe fall-back. diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index 702ee9bfea2..85c460a5fff 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -51,7 +51,7 @@ namespace Freestyle { // XXX Grmll... G is used as template's typename parameter :/ static const Global &_global = G; -#define LOGGING FALSE +#define LOGGING false using namespace std; diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index 3d1cb907ed0..4493080c8fb 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp @@ -130,7 +130,7 @@ static real angle_from_cotan(WVertex *vo, WVertex *v1, WVertex *v2) * VisMath '02, Berlin (Germany) * http://www-grail.usc.edu/pubs.html * - * Returns: %TRUE if the operator could be evaluated, %FALSE if the evaluation failed for some reason (@v is + * Returns: %true if the operator could be evaluated, %false if the evaluation failed for some reason (@v is * boundary or is the endpoint of a non-manifold edge.) */ bool gts_vertex_mean_curvature_normal(WVertex *v, Vec3r &Kh) @@ -192,7 +192,7 @@ bool gts_vertex_mean_curvature_normal(WVertex *v, Vec3r &Kh) * VisMath '02, Berlin (Germany) * http://www-grail.usc.edu/pubs.html * - * Returns: %TRUE if the operator could be evaluated, %FALSE if the evaluation failed for some reason (@v is + * Returns: %true if the operator could be evaluated, %false if the evaluation failed for some reason (@v is * boundary or is the endpoint of a non-manifold edge.) */ bool gts_vertex_gaussian_curvature(WVertex *v, real *Kg) -- cgit v1.2.3