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>2009-07-25 22:02:34 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2009-07-25 22:02:34 +0400
commitb25e4b6474e600d942ab28a610bbd3d9185615dd (patch)
treef1d2b7deb9043c07d45f4c8d7d18ad4b562c0bc6 /source/blender/freestyle/intern/stroke
parentfec3ddabb1d75ee6a3a28589813f2acc85215e18 (diff)
Fixed a problem related to AdjacencyIterator. In the Python layer,
AdjacencyIterator::isBegin() and AdjacencyIterator::isEnd() always returned a False value and printed a "not implemented" warning message. This caused an infinite loop in a few chaining iterators, resulting in a crash of the program. The origin of the issue seemed to be a fact that in the C++ layer, the AdjacencyIterator class had not properly overloaded the definitions of the methods in the Iterator superclass. The fix here looks okay, although I'm not sure why this inconsistency was not addressed for a long time.
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
-rwxr-xr-xsource/blender/freestyle/intern/stroke/ChainingIterators.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h
index 1a40144d704..fb04be93b4d 100755
--- a/source/blender/freestyle/intern/stroke/ChainingIterators.h
+++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h
@@ -79,10 +79,10 @@ public:
return "AdjacencyIterator";
}
- virtual inline bool isEnd(){
+ virtual inline bool isEnd() const {
return _internalIterator.isEnd();
}
- virtual inline bool isBegin(){
+ virtual inline bool isBegin() const {
return _internalIterator.isBegin();
}
/*! Returns true if the current ViewEdge is is coming