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, 81 deletions

diff --git a/release/scripts/freestyle/style_modules/long_anisotropically_dense.py b/release/scripts/freestyle/style_modules/long_anisotropically_dense.py
deleted file mode 100755
index 52bb2dd1170..00000000000
--- a/release/scripts/freestyle/style_modules/long_anisotropically_dense.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-#  Filename : long_anisotropically_dense.py
-#  Author   : Stephane Grabli
-#  Date     : 04/08/2005
-#  Purpose  : Selects the lines that are long and have a high anisotropic 
-#             a priori density and uses causal density 
-#             to draw without cluttering. Ideally, half of the
-#             selected lines are culled using the causal density.
-#
-#             ********************* WARNING *************************************
-#             ******** The Directional a priori density maps must          ****** 
-#             ******** have been computed prior to using this style module ******
-#
-#############################################################################  
-#
-#  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 PredicatesB1D import *
-from Functions0D import *
-from Functions1D import *
-from shaders import *
-
-## custom density predicate
-class pyDensityUP1D(UnaryPredicate1D):
-	def __init__(self,wsize,threshold, integration = IntegrationType.MEAN, sampling=2.0):
- 		UnaryPredicate1D.__init__(self)
-		self._wsize = wsize
-		self._threshold = threshold
-		self._integration = integration
-		self._func = DensityF1D(self._wsize, self._integration, sampling)
-		self._func2 = DensityF1D(self._wsize, IntegrationType.MAX, sampling)
-   
-	def getName(self):
-		return "pyDensityUP1D"
-
-	def __call__(self, inter):
-		c = self._func(inter)
-		m = self._func2(inter)
-		if(c < self._threshold):
-			return 1
-		if( m > 4* c ):
-			if ( c < 1.5*self._threshold ):
-				return 1
-		return 0
-
-Operators.select(QuantitativeInvisibilityUP1D(0))
-Operators.bidirectionalChain(ChainSilhouetteIterator(),NotUP1D(QuantitativeInvisibilityUP1D(0)))
-Operators.select(pyHigherLengthUP1D(40))
-## selects lines having a high anisotropic a priori density
-Operators.select(pyHighDensityAnisotropyUP1D(0.3,4))
-Operators.sort(pyLengthBP1D())
-shaders_list =  [
-	SamplingShader(2.0),
-	ConstantThicknessShader(2),
-	ConstantColorShader(0.2,0.2,0.25,1), 
-			]
-## uniform culling
-Operators.create(pyDensityUP1D(3.0,2.0e-2, IntegrationType.MEAN, 0.1), shaders_list)
-
-