bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Partial fix for Bug #35695: Freestyle produces extra line across an object with pointed areas.

Browse Source 
The reported problem is a visual artefact (extra lines) generated by 
ChainingIterators.pySketchyChainingIterator used for sketchy chaining with the Same Object
option disabled in the Parameter Editor mode.  The issue is caused by an inconsistency in
the internal data structure (i.e., view map).  For now this fatal error condition is addressed
to avoid visually incorrect results.  Another fix will follow to address the cause of the
internal inconsistency.
This commit is contained in:
Tamito Kajiyama 2013-07-04 20:24:22 +00:00
parent 50148a0f53
commit db71b5ef88
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/scripts/freestyle/style_modules/ChainingIterators.py
View File

@ -24,6 +24,8 @@
from freestyle import AdjacencyIterator, ChainingIterator, ExternalContourUP1D, Nature, TVertex from freestyle import AdjacencyIterator, ChainingIterator, ExternalContourUP1D, Nature, TVertex
from freestyle import ContextFunctions as CF from freestyle import ContextFunctions as CF
import bpy
## the natural chaining iterator ## the natural chaining iterator
## It follows the edges of same nature following the topology of ## It follows the edges of same nature following the topology of
## objects with preseance on silhouettes, then borders, ## objects with preseance on silhouettes, then borders,
@ -238,14 +240,22 @@ class pySketchyChainingIterator(ChainingIterator):
self._timeStamp = CF.get_time_stamp()+self._nRounds self._timeStamp = CF.get_time_stamp()+self._nRounds
def traverse(self, iter): def traverse(self, iter):
winner = None winner = None
found = False
it = AdjacencyIterator(iter) it = AdjacencyIterator(iter)
while not it.is_end: while not it.is_end:
ve = it.object ve = it.object
if ve.id == self.current_edge.id: if ve.id == self.current_edge.id:
found = True
it.increment() it.increment()
continue continue
winner = ve winner = ve
it.increment() it.increment()
if not found:
# This is a fatal error condition: self.current_edge must be found
# among the edges seen by the AdjacencyIterator [bug #35695].
if bpy.app.debug_freestyle:
print('pySketchyChainingIterator: current edge not found')
return None
if winner is None: if winner is None:
winner = self.current_edge winner = self.current_edge
if winner.chaining_time_stamp == self._timeStamp: if winner.chaining_time_stamp == self._timeStamp: