diff options
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
32 files changed, 31 insertions, 124 deletions
diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h index dcab48fd12f..17e419bed54 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_ADVANCED_FUNCTIONS_0D_H__ -#define __FREESTYLE_ADVANCED_FUNCTIONS_0D_H__ +#pragma once /** \file * \ingroup freestyle @@ -209,5 +208,3 @@ class GetViewMapGradientNormF0D : public UnaryFunction0D<float> { } // end of namespace Functions0D } /* namespace Freestyle */ - -#endif // __FREESTYLE_ADVANCED_FUNCTIONS_0D_H__ diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h index d14a9836b95..349db393e17 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_ADVANCED_FUNCTIONS_1D_H__ -#define __FREESTYLE_ADVANCED_FUNCTIONS_1D_H__ +#pragma once /** \file * \ingroup freestyle @@ -289,5 +288,3 @@ class GetViewMapGradientNormF1D : public UnaryFunction1D<double> { } // end of namespace Functions1D } /* namespace Freestyle */ - -#endif // __FREESTYLE_ADVANCED_FUNCTIONS_1D_H__ diff --git a/source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h b/source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h index 05fcf7f356f..25a5efcce34 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_ADVANCED_PREDICATES_1D_H__ -#define __FREESTYLE_ADVANCED_PREDICATES_1D_H__ +#pragma once /** \file * \ingroup freestyle @@ -82,5 +81,3 @@ class DensityLowerThanUP1D : public UnaryPredicate1D { } // end of namespace Predicates1D } /* namespace Freestyle */ - -#endif // __FREESTYLE_ADVANCED_PREDICATES_1D_H__ diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h index 544fdee519f..63c7d451599 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_ADVANCED_STROKE_SHADERS_H__ -#define __FREESTYLE_ADVANCED_STROKE_SHADERS_H__ +#pragma once /** \file * \ingroup freestyle @@ -232,5 +231,3 @@ class OmissionShader : public StrokeShader { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_ADVANCED_STROKE_SHADERS_H__ diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp index d969e0e50a3..36234ad619c 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp @@ -37,10 +37,8 @@ #include "BKE_global.h" -extern "C" { #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -} namespace Freestyle { diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h index 5a2d0cbe458..8663cfd42bf 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_BASIC_STROKE_SHADERS_H__ -#define __FREESTYLE_BASIC_STROKE_SHADERS_H__ +#pragma once /** \file * \ingroup freestyle @@ -660,5 +659,3 @@ class StrokeTextureStepShader : public StrokeShader { } // end of namespace StrokeShaders } /* namespace Freestyle */ - -#endif // __FREESTYLE_BASIC_STROKE_SHADERS_H__ diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index 4386e64345f..14c74c0f127 100644 --- a/source/blender/freestyle/intern/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp @@ -90,9 +90,7 @@ Canvas::~Canvas() } _maps.clear(); } - if (_steerableViewMap) { - delete _steerableViewMap; - } + delete _steerableViewMap; } void Canvas::preDraw() diff --git a/source/blender/freestyle/intern/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h index 2a0ebbe17c5..2bbd9c2682f 100644 --- a/source/blender/freestyle/intern/stroke/Canvas.h +++ b/source/blender/freestyle/intern/stroke/Canvas.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_CANVAS_H__ -#define __FREESTYLE_CANVAS_H__ +#pragma once /** \file * \ingroup freestyle @@ -252,5 +251,3 @@ class Canvas { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_CANVAS_H__ diff --git a/source/blender/freestyle/intern/stroke/Chain.h b/source/blender/freestyle/intern/stroke/Chain.h index 7cd0c64cc16..d5dae5c35ba 100644 --- a/source/blender/freestyle/intern/stroke/Chain.h +++ b/source/blender/freestyle/intern/stroke/Chain.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_CHAIN_H__ -#define __FREESTYLE_CHAIN_H__ +#pragma once /** \file * \ingroup freestyle @@ -109,5 +108,3 @@ class Chain : public Curve { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_CHAIN_H__ diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h index 36611a4a009..e3d49c167b5 100644 --- a/source/blender/freestyle/intern/stroke/ChainingIterators.h +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_CHAINING_ITERATORS_H__ -#define __FREESTYLE_CHAINING_ITERATORS_H__ +#pragma once /** \file * \ingroup freestyle @@ -415,5 +414,3 @@ class ChainPredicateIterator : public ChainingIterator { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_CHAINING_ITERATORS_H__ diff --git a/source/blender/freestyle/intern/stroke/ContextFunctions.h b/source/blender/freestyle/intern/stroke/ContextFunctions.h index 6897e2b193d..334bdd657c1 100644 --- a/source/blender/freestyle/intern/stroke/ContextFunctions.h +++ b/source/blender/freestyle/intern/stroke/ContextFunctions.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_CONTEXT_FUNCTIONS_H__ -#define __FREESTYLE_CONTEXT_FUNCTIONS_H__ +#pragma once /** \file * \ingroup freestyle @@ -106,5 +105,3 @@ FEdge *GetSelectedFEdgeCF(); } // end of namespace ContextFunctions } /* namespace Freestyle */ - -#endif // __FREESTYLE_CONTEXT_FUNCTIONS_H__ diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 8a233eef4ab..5f0d2a6aed7 100644 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_CURVE_H__ -#define __FREESTYLE_CURVE_H__ +#pragma once /** \file * \ingroup freestyle @@ -604,5 +603,3 @@ class Curve : public Interface1D { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_CURVE_H__ diff --git a/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h index 4ac4c04774e..1896a674477 100644 --- a/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h +++ b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_CURVE_ADVANCED_ITERATORS_H__ -#define __FREESTYLE_CURVE_ADVANCED_ITERATORS_H__ +#pragma once /** \file * \ingroup freestyle @@ -388,5 +387,3 @@ class __point_iterator : public IteratorBase<Traits, BidirectionalIteratorTag_Tr } // end of namespace CurveInternal } /* namespace Freestyle */ - -#endif // __FREESTYLE_CURVE_ADVANCED_ITERATORS_H__ diff --git a/source/blender/freestyle/intern/stroke/CurveIterators.h b/source/blender/freestyle/intern/stroke/CurveIterators.h index 3ac7ede0954..9d1cf33ed80 100644 --- a/source/blender/freestyle/intern/stroke/CurveIterators.h +++ b/source/blender/freestyle/intern/stroke/CurveIterators.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_CURVE_ITERATORS_H__ -#define __FREESTYLE_CURVE_ITERATORS_H__ +#pragma once /** \file * \ingroup freestyle @@ -303,5 +302,3 @@ class CurvePointIterator : public Interface0DIteratorNested { } // end of namespace CurveInternal } /* namespace Freestyle */ - -#endif // __FREESTYLE_CURVE_ITERATORS_H__ diff --git a/source/blender/freestyle/intern/stroke/Modifiers.h b/source/blender/freestyle/intern/stroke/Modifiers.h index ecdfd25c499..0aac6f58658 100644 --- a/source/blender/freestyle/intern/stroke/Modifiers.h +++ b/source/blender/freestyle/intern/stroke/Modifiers.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_MODIFIERS_H__ -#define __FREESTYLE_MODIFIERS_H__ +#pragma once /** \file * \ingroup freestyle @@ -71,5 +70,3 @@ template<class Edge> struct TimestampModifier : public EdgeModifier<Edge> { }; } /* namespace Freestyle */ - -#endif // MODIFIERS_H diff --git a/source/blender/freestyle/intern/stroke/Module.h b/source/blender/freestyle/intern/stroke/Module.h index 3e32361eb45..58c44751d91 100644 --- a/source/blender/freestyle/intern/stroke/Module.h +++ b/source/blender/freestyle/intern/stroke/Module.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_MODULE_H__ -#define __FREESTYLE_MODULE_H__ +#pragma once /** \file * \ingroup freestyle @@ -76,5 +75,3 @@ class Module { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_MODULE_H__ diff --git a/source/blender/freestyle/intern/stroke/Operators.h b/source/blender/freestyle/intern/stroke/Operators.h index 2da9d30f172..e721e9fb837 100644 --- a/source/blender/freestyle/intern/stroke/Operators.h +++ b/source/blender/freestyle/intern/stroke/Operators.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_OPERATORS_H__ -#define __FREESTYLE_OPERATORS_H__ +#pragma once /** \file * \ingroup freestyle @@ -290,5 +289,3 @@ class Operators { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_OPERATORS_H__ diff --git a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h index 7ddd3d3e4c0..78aa17d26b6 100644 --- a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_PS_STROKE_RENDERER_H__ -#define __FREESTYLE_PS_STROKE_RENDERER_H__ +#pragma once /** \file * \ingroup freestyle @@ -55,5 +54,3 @@ class PSStrokeRenderer : public StrokeRenderer { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_PS_STROKE_RENDERER_H__ diff --git a/source/blender/freestyle/intern/stroke/Predicates0D.h b/source/blender/freestyle/intern/stroke/Predicates0D.h index 90b6d99f2db..89dbaeb339d 100644 --- a/source/blender/freestyle/intern/stroke/Predicates0D.h +++ b/source/blender/freestyle/intern/stroke/Predicates0D.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_PREDICATES_0D_H__ -#define __FREESTYLE_PREDICATES_0D_H__ +#pragma once /** \file * \ingroup freestyle @@ -178,5 +177,3 @@ class FalseUP0D : public UnaryPredicate0D { } // end of namespace Predicates0D } /* namespace Freestyle */ - -#endif // __FREESTYLE_PREDICATES_0D_H__ diff --git a/source/blender/freestyle/intern/stroke/Predicates1D.h b/source/blender/freestyle/intern/stroke/Predicates1D.h index 0ad4c69f869..a3953950d86 100644 --- a/source/blender/freestyle/intern/stroke/Predicates1D.h +++ b/source/blender/freestyle/intern/stroke/Predicates1D.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_PREDICATES_1D_H__ -#define __FREESTYLE_PREDICATES_1D_H__ +#pragma once /** \file * \ingroup freestyle @@ -580,5 +579,3 @@ class ViewMapGradientNormBP1D : public BinaryPredicate1D { } // end of namespace Predicates1D } /* namespace Freestyle */ - -#endif // __FREESTYLE_PREDICATES_1D_H__ diff --git a/source/blender/freestyle/intern/stroke/QInformationMap.h b/source/blender/freestyle/intern/stroke/QInformationMap.h index d3a4218f9d7..0f651a656bf 100644 --- a/source/blender/freestyle/intern/stroke/QInformationMap.h +++ b/source/blender/freestyle/intern/stroke/QInformationMap.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_Q_INFORMATION_MAP_H__ -#define __FREESTYLE_Q_INFORMATION_MAP_H__ +#pragma once /** \file * \ingroup freestyle @@ -59,5 +58,3 @@ class QInformationMap : public InformationMap { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_Q_INFORMATION_MAP_H__ diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp index 2f29eac83b1..93a870c26ad 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp @@ -484,9 +484,7 @@ Stroke &Stroke::operator=(const Stroke &iBrother) _id = iBrother._id; _ViewEdges = iBrother._ViewEdges; _sampling = iBrother._sampling; - if (_rep) { - delete _rep; - } + delete _rep; if (iBrother._rep) { _rep = new StrokeRep(*(iBrother._rep)); } diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index 7983e8cdde2..71753b25328 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_STROKE_H__ -#define __FREESTYLE_STROKE_H__ +#pragma once /** \file * \ingroup freestyle @@ -894,5 +893,3 @@ Stroke::Stroke(InputVertexIterator iBegin, InputVertexIterator iEnd) } } /* namespace Freestyle */ - -#endif // __FREESTYLE_STROKE_H__ diff --git a/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h b/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h index b8c96533a1c..4256cdebe86 100644 --- a/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h +++ b/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_STROKE_ADVANCED_ITERATORS_H__ -#define __FREESTYLE_STROKE_ADVANCED_ITERATORS_H__ +#pragma once /** \file * \ingroup freestyle @@ -179,5 +178,3 @@ class vertex_iterator_base : public IteratorBase<Traits, BidirectionalIteratorTa } // end of namespace StrokeInternal } /* namespace Freestyle */ - -#endif // __FREESTYLE_STROKE_ADVANCED_ITERATORS_H__ diff --git a/source/blender/freestyle/intern/stroke/StrokeIO.h b/source/blender/freestyle/intern/stroke/StrokeIO.h index ae38847f8cc..a0e59655eed 100644 --- a/source/blender/freestyle/intern/stroke/StrokeIO.h +++ b/source/blender/freestyle/intern/stroke/StrokeIO.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_STROKE_IO_H__ -#define __FREESTYLE_STROKE_IO_H__ +#pragma once /** \file * \ingroup freestyle @@ -37,5 +36,3 @@ ostream &operator<<(ostream &out, const StrokeVertex &iStrokeVertex); ostream &operator<<(ostream &out, const Stroke &iStroke); } /* namespace Freestyle */ - -#endif // __FREESTYLE_STROKE_IO_H__ diff --git a/source/blender/freestyle/intern/stroke/StrokeIterators.h b/source/blender/freestyle/intern/stroke/StrokeIterators.h index 71932d8487a..d4cbffd535e 100644 --- a/source/blender/freestyle/intern/stroke/StrokeIterators.h +++ b/source/blender/freestyle/intern/stroke/StrokeIterators.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_STROKE_ITERATORS_H__ -#define __FREESTYLE_STROKE_ITERATORS_H__ +#pragma once /** \file * \ingroup freestyle @@ -232,5 +231,3 @@ class StrokeVertexIterator : public Interface0DIteratorNested { } // end of namespace StrokeInternal } /* namespace Freestyle */ - -#endif // __FREESTYLE_STROKE_ITERATORS_H__ diff --git a/source/blender/freestyle/intern/stroke/StrokeLayer.h b/source/blender/freestyle/intern/stroke/StrokeLayer.h index ecb98025875..2101e7732ce 100644 --- a/source/blender/freestyle/intern/stroke/StrokeLayer.h +++ b/source/blender/freestyle/intern/stroke/StrokeLayer.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_STROKE_LAYER_H__ -#define __FREESTYLE_STROKE_LAYER_H__ +#pragma once /** \file * \ingroup freestyle @@ -102,5 +101,3 @@ class StrokeLayer { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_STROKE_LAYER_H__ diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h index 67deb5eebf3..2fb08b880d9 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_STROKE_RENDERER_H__ -#define __FREESTYLE_STROKE_RENDERER_H__ +#pragma once /** \file * \ingroup freestyle @@ -142,5 +141,3 @@ class StrokeRenderer { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_STROKE_RENDERER_H__ diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.h b/source/blender/freestyle/intern/stroke/StrokeRep.h index d6ee1d01279..09048b8e147 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRep.h +++ b/source/blender/freestyle/intern/stroke/StrokeRep.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_STROKE_REP_H__ -#define __FREESTYLE_STROKE_REP_H__ +#pragma once /** \file * \ingroup freestyle @@ -278,5 +277,3 @@ class StrokeRep { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_STROKE_REP_H__ diff --git a/source/blender/freestyle/intern/stroke/StrokeShader.h b/source/blender/freestyle/intern/stroke/StrokeShader.h index 7b1f12a8c9d..f4984136747 100644 --- a/source/blender/freestyle/intern/stroke/StrokeShader.h +++ b/source/blender/freestyle/intern/stroke/StrokeShader.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_STROKE_SHADERS_H__ -#define __FREESTYLE_STROKE_SHADERS_H__ +#pragma once /** \file * \ingroup freestyle @@ -96,5 +95,3 @@ class StrokeShader { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_STROKE_SHADERS_H__ diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.h b/source/blender/freestyle/intern/stroke/StrokeTesselator.h index 8cece705ed4..0c1efb873bc 100644 --- a/source/blender/freestyle/intern/stroke/StrokeTesselator.h +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_STROKE_TESSELATOR_H__ -#define __FREESTYLE_STROKE_TESSELATOR_H__ +#pragma once /** \file * \ingroup freestyle @@ -73,5 +72,3 @@ class StrokeTesselator { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_STROKE_TESSELATOR_H__ diff --git a/source/blender/freestyle/intern/stroke/StyleModule.h b/source/blender/freestyle/intern/stroke/StyleModule.h index 6f03d903045..398e4c7ee77 100644 --- a/source/blender/freestyle/intern/stroke/StyleModule.h +++ b/source/blender/freestyle/intern/stroke/StyleModule.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_STYLE_MODULE_H__ -#define __FREESTYLE_STYLE_MODULE_H__ +#pragma once /** \file * \ingroup freestyle @@ -182,5 +181,3 @@ class StyleModule { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_STYLE_MODULE_H__ |