Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2011-02-22 04:43:08 +0300
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2011-02-22 04:43:08 +0300
commitdf7f4f639fe9b8ab6f8b8727833a009b25bc6ab5 (patch)
treef74fa619e237f82bd0be419a7a384b8915730c09 /source/blender/freestyle/intern/view_map/Functions0D.cpp
parentecd76d99d64d76846f9f1ed24c54a82b6e9ad041 (diff)
Two minor fixes:
* Fixed a bug in MaterialF0D::operator() that an error condition was ignored due to a wrong return value. * Fixed a typo in the docstring of StrokeVertex::setPoint().
Diffstat (limited to 'source/blender/freestyle/intern/view_map/Functions0D.cpp')
-rwxr-xr-xsource/blender/freestyle/intern/view_map/Functions0D.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/freestyle/intern/view_map/Functions0D.cpp b/source/blender/freestyle/intern/view_map/Functions0D.cpp
index dc38ca34184..a9f997e66b0 100755
--- a/source/blender/freestyle/intern/view_map/Functions0D.cpp
+++ b/source/blender/freestyle/intern/view_map/Functions0D.cpp
@@ -289,13 +289,8 @@ namespace Functions0D {
int MaterialF0D::operator()(Interface0DIterator& iter) {
FEdge *fe1, *fe2;
getFEdges(iter,fe1,fe2);
-
- if(fe1 == 0) {
- // DEBUG
- getFEdges(iter, fe1, fe2);
- return 1;
- }
-
+ if(fe1 == 0)
+ return -1;
if(fe1->isSmooth())
result = ((FEdgeSmooth*)fe1)->frs_material();
else