Merged

https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).

After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.

1 files changed, 0 insertions, 68 deletions

diff --git a/release/scripts/freestyle/style_modules/sequentialsplit_sketchy.py b/release/scripts/freestyle/style_modules/sequentialsplit_sketchy.py
deleted file mode 100755
index 53fa03103aa..00000000000
--- a/release/scripts/freestyle/style_modules/sequentialsplit_sketchy.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-#  Filename : sequentialsplit_sketchy.py
-#  Author   : Stephane Grabli
-#  Date     : 04/08/2005
-#  Purpose  : Use the sequential split with two different
-#             predicates to specify respectively the starting and
-#             the stopping extremities for strokes 
-#
-#############################################################################  
-#
-#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
-#  with this source distribution. 
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-#############################################################################
-
-from freestyle_init import *
-from logical_operators import *
-from PredicatesU1D import *
-from PredicatesU0D import *
-from Functions0D import *
-
-## Predicate to tell whether a TVertex
-## corresponds to a change from 0 to 1 or not.
-class pyBackTVertexUP0D(UnaryPredicate0D):
-	def __init__(self):
-		UnaryPredicate0D.__init__(self)
-		self._getQI = QuantitativeInvisibilityF0D()
-	def getName(self):
-		return "pyBackTVertexUP0D"
-	def __call__(self, iter):
-		v = iter.getObject()
-		nat = v.getNature()
-		if(nat & Nature.T_VERTEX == 0):
-			return 0
-		if(self._getQI(iter) != 0):
-			return 1
-		return 0
-
-
-upred = QuantitativeInvisibilityUP1D(0)
-Operators.select(upred)
-Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
-## starting and stopping predicates:
-start = pyVertexNatureUP0D(Nature.NON_T_VERTEX)
-stop = pyBackTVertexUP0D()
-Operators.sequentialSplit(start, stop, 10)
-shaders_list = [
-		SpatialNoiseShader(7, 120, 2, True, True), 
-		IncreasingThicknessShader(5, 8), 
-		ConstantColorShader(0.2, 0.2, 0.2, 1), 
-		TextureAssignerShader(4)
-		]
-Operators.create(TrueUP1D(), shaders_list)
-