diff options
Diffstat (limited to 'source/blender/freestyle/intern/winged_edge')
10 files changed, 11 insertions, 37 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index 96b313d4e01..1702a22c678 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp @@ -59,7 +59,7 @@ static bool angle_obtuse(WVertex *v, WFace *f) // FIXME // WVvertex is useless but kept for history reasons -static bool triangle_obtuse(WVertex *, WFace *f) +static bool triangle_obtuse(WVertex *UNUSED(v), WFace *f) { bool b = false; for (int i = 0; i < 3; i++) { diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.h b/source/blender/freestyle/intern/winged_edge/Curvature.h index 32e9ea8b5cf..9ecc92df2ac 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.h +++ b/source/blender/freestyle/intern/winged_edge/Curvature.h @@ -27,8 +27,7 @@ * FRANCE */ -#ifndef __FREESTYLE_CURVATURE_H__ -#define __FREESTYLE_CURVATURE_H__ +#pragma once /** \file * \ingroup freestyle @@ -142,5 +141,3 @@ void compute_curvature_tensor_one_ring(WVertex *start, NormalCycle &nc); } // namespace OGF } /* namespace Freestyle */ - -#endif /* __FREESTYLE_CURVATURE_H__ */ diff --git a/source/blender/freestyle/intern/winged_edge/Nature.h b/source/blender/freestyle/intern/winged_edge/Nature.h index 91f9f63b412..68323d7122c 100644 --- a/source/blender/freestyle/intern/winged_edge/Nature.h +++ b/source/blender/freestyle/intern/winged_edge/Nature.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_NATURE_H__ -#define __FREESTYLE_NATURE_H__ +#pragma once /** \file * \ingroup freestyle @@ -67,5 +66,3 @@ static const EdgeNature EDGE_MARK = (1 << 7); // 128 } // end of namespace Nature } /* namespace Freestyle */ - -#endif // __FREESTYLE_NATURE_H__ diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index 424cd76a6b7..42a8e62990f 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_W_EDGE_H__ -#define __FREESTYLE_W_EDGE_H__ +#pragma once /** \file * \ingroup freestyle @@ -1428,5 +1427,3 @@ inline void WOEdge::setVecAndAngle() } } /* namespace Freestyle */ - -#endif // __FREESTYLE_W_EDGE_H__ diff --git a/source/blender/freestyle/intern/winged_edge/WFillGrid.h b/source/blender/freestyle/intern/winged_edge/WFillGrid.h index 918c1f154f3..095a58675c0 100644 --- a/source/blender/freestyle/intern/winged_edge/WFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_W_FILL_GRID_H__ -#define __FREESTYLE_W_FILL_GRID_H__ +#pragma once /** \file * \ingroup freestyle @@ -85,5 +84,3 @@ class WFillGrid { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_W_FILL_GRID_H__ diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h index e3deebcd6c2..5393f57d2cd 100644 --- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_WS_FILL_GRID_H__ -#define __FREESTYLE_WS_FILL_GRID_H__ +#pragma once /** \file * \ingroup freestyle @@ -81,5 +80,3 @@ class WSFillGrid { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_WS_FILL_GRID_H__ diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h index 21418c44614..8fe99f9bb93 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_WX_EDGE_H__ -#define __FREESTYLE_WX_EDGE_H__ +#pragma once /** \file * \ingroup freestyle @@ -845,5 +844,3 @@ bool WXVertex::isFeature() } } /* namespace Freestyle */ - -#endif // __FREESTYLE_WX_EDGE_H__ diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h index d223cee5e0e..efba18eb084 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_WX_EDGE_BUILDER_H__ -#define __FREESTYLE_WX_EDGE_BUILDER_H__ +#pragma once /** \file * \ingroup freestyle @@ -48,5 +47,3 @@ class WXEdgeBuilder : public WingedEdgeBuilder { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_WX_EDGE_BUILDER_H__ diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp index 63f65988fc9..c989d77a730 100644 --- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp @@ -64,11 +64,9 @@ void WingedEdgeBuilder::visitNodeTransform(NodeTransform &tn) _current_matrix = new_matrix; } -void WingedEdgeBuilder::visitNodeTransformAfter(NodeTransform &) +void WingedEdgeBuilder::visitNodeTransformAfter(NodeTransform &UNUSED(transform)) { - if (_current_matrix) { - delete _current_matrix; - } + delete _current_matrix; if (_matrices_stack.empty()) { _current_matrix = NULL; diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h index 5c728dea1d8..8cf86a421b7 100644 --- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_WINGED_EDGE_BUILDER_H__ -#define __FREESTYLE_WINGED_EDGE_BUILDER_H__ +#pragma once /** \file * \ingroup freestyle @@ -174,5 +173,3 @@ class WingedEdgeBuilder : public SceneVisitor { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_WINGED_EDGE_BUILDER_H__ |