diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
| commit | 080cf9332bc9d71e0e14326bc8efdf06b738dea1 (patch) | |
| tree | e8531a509dca4d8253aa19d89edc68152421f9e5 /source/blender/freestyle/intern/view_map/ViewMap.cpp | |
| parent | 6d495cc4ef071171ff0686b2be898a41e05b8051 (diff) | |
| parent | 9676642cc94599b3419c9aaa5cf1aae2fbbd235f (diff) | |
Merge branch 'gooseberry' into temp_motionpathstemp_motionpaths
Conflicts:
source/blender/blenkernel/intern/object.c
Diffstat (limited to 'source/blender/freestyle/intern/view_map/ViewMap.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/view_map/ViewMap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp index 6bb0082e379..52769413e79 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp @@ -701,12 +701,12 @@ Interface0DIterator ViewEdge::verticesEnd() return ret; } -Interface0DIterator ViewEdge::pointsBegin(float t) +Interface0DIterator ViewEdge::pointsBegin(float /*t*/) { return verticesBegin(); } -Interface0DIterator ViewEdge::pointsEnd(float t) +Interface0DIterator ViewEdge::pointsEnd(float /*t*/) { return verticesEnd(); } |