[Bf-blender-cvs] [7d38d85] master: Freestyle: Fix for references of deprecated texture stroke shaders.
Folkert de Vries
noreply at git.blender.org
Mon Mar 9 04:55:22 CET 2015
Commit: 7d38d8534024c5b4efa7165e87bfdd2032d5099a
Author: Folkert de Vries
Date: Tue Jan 27 23:11:31 2015 +0100
Branches: master
https://developer.blender.org/rB7d38d8534024c5b4efa7165e87bfdd2032d5099a
Freestyle: Fix for references of deprecated texture stroke shaders.
Removed all references of deprecated texture shader. Also deleted
several lines of dead code.
Since texture_shader.py no longer does what it was supposed to do,
the file itself was removed.
Patch reviewed by Tamito Kajiyama (kjym3).
===================================================================
M release/scripts/freestyle/styles/anisotropic_diffusion.py
M release/scripts/freestyle/styles/backbone_stretcher.py
M release/scripts/freestyle/styles/blueprint_circles.py
M release/scripts/freestyle/styles/blueprint_ellipses.py
M release/scripts/freestyle/styles/blueprint_squares.py
M release/scripts/freestyle/styles/curvature2d.py
M release/scripts/freestyle/styles/external_contour_sketchy.py
M release/scripts/freestyle/styles/japanese_bigbrush.py
M release/scripts/freestyle/styles/multiple_parameterization.py
M release/scripts/freestyle/styles/near_lines.py
M release/scripts/freestyle/styles/qi0_not_external_contour.py
M release/scripts/freestyle/styles/sequentialsplit_sketchy.py
M release/scripts/freestyle/styles/sketchy_multiple_parameterization.py
M release/scripts/freestyle/styles/sketchy_topology_broken.py
M release/scripts/freestyle/styles/sketchy_topology_preserved.py
M release/scripts/freestyle/styles/split_at_highest_2d_curvatures.py
M release/scripts/freestyle/styles/split_at_tvertices.py
D release/scripts/freestyle/styles/stroke_texture.py
M release/scripts/freestyle/styles/uniformpruning_zsort.py
===================================================================
diff --git a/release/scripts/freestyle/styles/anisotropic_diffusion.py b/release/scripts/freestyle/styles/anisotropic_diffusion.py
index 946c111..fc136b2 100644
--- a/release/scripts/freestyle/styles/anisotropic_diffusion.py
+++ b/release/scripts/freestyle/styles/anisotropic_diffusion.py
@@ -34,7 +34,6 @@ from freestyle.shaders import (
ConstantThicknessShader,
IncreasingColorShader,
SamplingShader,
- StrokeTextureShader,
pyDiffusion2Shader,
)
from freestyle.types import Operators, Stroke
@@ -50,7 +49,6 @@ bpred = TrueBP1D()
Operators.bidirectional_chain(ChainPredicateIterator(upred, bpred), NotUP1D(upred))
shaders_list = [
ConstantThicknessShader(4),
- StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, False),
SamplingShader(2),
pyDiffusion2Shader(offset, nbIter),
IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1),
diff --git a/release/scripts/freestyle/styles/backbone_stretcher.py b/release/scripts/freestyle/styles/backbone_stretcher.py
index 3eb921d..cc495f3 100644
--- a/release/scripts/freestyle/styles/backbone_stretcher.py
+++ b/release/scripts/freestyle/styles/backbone_stretcher.py
@@ -30,7 +30,6 @@ from freestyle.predicates import (
from freestyle.shaders import (
BackboneStretcherShader,
ConstantColorShader,
- TextureAssignerShader,
)
from freestyle.types import Operators
@@ -38,7 +37,6 @@ from freestyle.types import Operators
Operators.select(QuantitativeInvisibilityUP1D(0))
Operators.bidirectional_chain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
shaders_list = [
- TextureAssignerShader(4),
ConstantColorShader(0.5, 0.5, 0.5),
BackboneStretcherShader(20),
]
diff --git a/release/scripts/freestyle/styles/blueprint_circles.py b/release/scripts/freestyle/styles/blueprint_circles.py
index aade164..f39cda5 100644
--- a/release/scripts/freestyle/styles/blueprint_circles.py
+++ b/release/scripts/freestyle/styles/blueprint_circles.py
@@ -34,7 +34,6 @@ from freestyle.predicates import (
from freestyle.shaders import (
ConstantThicknessShader,
IncreasingColorShader,
- TextureAssignerShader,
pyBluePrintCirclesShader,
pyPerlinNoise1DShader,
)
@@ -50,7 +49,6 @@ shaders_list = [
ConstantThicknessShader(5),
pyBluePrintCirclesShader(3),
pyPerlinNoise1DShader(0.1, 15, 8),
- TextureAssignerShader(4),
IncreasingColorShader(0.8, 0.8, 0.3, 0.4, 0.3, 0.3, 0.3, 0.1),
]
Operators.create(TrueUP1D(), shaders_list)
diff --git a/release/scripts/freestyle/styles/blueprint_ellipses.py b/release/scripts/freestyle/styles/blueprint_ellipses.py
index d0bd0c4..3d977a1 100644
--- a/release/scripts/freestyle/styles/blueprint_ellipses.py
+++ b/release/scripts/freestyle/styles/blueprint_ellipses.py
@@ -34,7 +34,6 @@ from freestyle.predicates import (
from freestyle.shaders import (
ConstantThicknessShader,
IncreasingColorShader,
- TextureAssignerShader,
pyBluePrintEllipsesShader,
pyPerlinNoise1DShader,
)
@@ -50,7 +49,6 @@ shaders_list = [
ConstantThicknessShader(5),
pyBluePrintEllipsesShader(3),
pyPerlinNoise1DShader(0.1, 10, 8),
- TextureAssignerShader(4),
IncreasingColorShader(0.6, 0.3, 0.3, 0.7, 0.3, 0.3, 0.3, 0.1),
]
Operators.create(TrueUP1D(), shaders_list)
diff --git a/release/scripts/freestyle/styles/blueprint_squares.py b/release/scripts/freestyle/styles/blueprint_squares.py
index 82ab6a8..7110fe4 100644
--- a/release/scripts/freestyle/styles/blueprint_squares.py
+++ b/release/scripts/freestyle/styles/blueprint_squares.py
@@ -34,7 +34,6 @@ from freestyle.predicates import (
from freestyle.shaders import (
ConstantThicknessShader,
IncreasingColorShader,
- TextureAssignerShader,
pyBluePrintSquaresShader,
pyPerlinNoise1DShader,
)
@@ -50,7 +49,6 @@ shaders_list = [
ConstantThicknessShader(8),
pyBluePrintSquaresShader(2, 20),
pyPerlinNoise1DShader(0.07, 10, 8),
- TextureAssignerShader(4),
IncreasingColorShader(0.6, 0.3, 0.3, 0.7, 0.6, 0.3, 0.3, 0.3),
ConstantThicknessShader(4),
]
diff --git a/release/scripts/freestyle/styles/curvature2d.py b/release/scripts/freestyle/styles/curvature2d.py
index 66c8a6c..faf1223 100644
--- a/release/scripts/freestyle/styles/curvature2d.py
+++ b/release/scripts/freestyle/styles/curvature2d.py
@@ -30,7 +30,6 @@ from freestyle.predicates import (
)
from freestyle.shaders import (
ConstantThicknessShader,
- StrokeTextureShader,
py2DCurvatureColorShader,
)
from freestyle.types import Operators, Stroke
@@ -39,7 +38,6 @@ from freestyle.types import Operators, Stroke
Operators.select(QuantitativeInvisibilityUP1D(0))
Operators.bidirectional_chain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
shaders_list = [
- StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, False),
ConstantThicknessShader(5),
py2DCurvatureColorShader()
]
diff --git a/release/scripts/freestyle/styles/external_contour_sketchy.py b/release/scripts/freestyle/styles/external_contour_sketchy.py
index 6a7a233..44dbda4 100644
--- a/release/scripts/freestyle/styles/external_contour_sketchy.py
+++ b/release/scripts/freestyle/styles/external_contour_sketchy.py
@@ -37,7 +37,6 @@ from freestyle.shaders import (
SamplingShader,
SmoothingShader,
SpatialNoiseShader,
- TextureAssignerShader,
)
from freestyle.types import Operators
@@ -51,6 +50,5 @@ shaders_list = [
IncreasingThicknessShader(4, 10),
SmoothingShader(400, 0.1, 0, 0.2, 0, 0, 0, 1),
IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1),
- TextureAssignerShader(4),
]
Operators.create(TrueUP1D(), shaders_list)
diff --git a/release/scripts/freestyle/styles/japanese_bigbrush.py b/release/scripts/freestyle/styles/japanese_bigbrush.py
index 521fbbc..a312bcd 100644
--- a/release/scripts/freestyle/styles/japanese_bigbrush.py
+++ b/release/scripts/freestyle/styles/japanese_bigbrush.py
@@ -37,7 +37,6 @@ from freestyle.shaders import (
ConstantColorShader,
ConstantThicknessShader,
SamplingShader,
- TextureAssignerShader,
TipRemoverShader,
pyNonLinearVaryingThicknessShader,
pySamplingShader,
@@ -62,7 +61,6 @@ shaders_list = [
SamplingShader(50),
ConstantThicknessShader(10),
pyNonLinearVaryingThicknessShader(4, 25, 0.6),
- TextureAssignerShader(6),
ConstantColorShader(0.2, 0.2, 0.2,1.0),
TipRemoverShader(10),
]
diff --git a/release/scripts/freestyle/styles/multiple_parameterization.py b/release/scripts/freestyle/styles/multiple_parameterization.py
index bf0691f..0e224c7 100644
--- a/release/scripts/freestyle/styles/multiple_parameterization.py
+++ b/release/scripts/freestyle/styles/multiple_parameterization.py
@@ -37,7 +37,6 @@ from freestyle.shaders import (
IncreasingColorShader,
IncreasingThicknessShader,
SamplingShader,
- TextureAssignerShader,
pyHLRShader,
)
from freestyle.types import Operators
@@ -52,7 +51,6 @@ shaders_list = [
IncreasingThicknessShader(1.5, 30),
ConstantColorShader(0.0, 0.0, 0.0),
IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1),
- TextureAssignerShader(-1),
pyHLRShader(), ## this shader draws only visible portions
]
Operators.create(TrueUP1D(), shaders_list)
diff --git a/release/scripts/freestyle/styles/near_lines.py b/release/scripts/freestyle/styles/near_lines.py
index b91eaea..5e260a2 100644
--- a/release/scripts/freestyle/styles/near_lines.py
+++ b/release/scripts/freestyle/styles/near_lines.py
@@ -33,7 +33,6 @@ from freestyle.predicates import (
from freestyle.shaders import (
ConstantColorShader,
ConstantThicknessShader,
- TextureAssignerShader,
)
from freestyle.types import IntegrationType, Operators
@@ -42,7 +41,6 @@ upred = AndUP1D(QuantitativeInvisibilityUP1D(0), pyZSmallerUP1D(0.5, Integration
Operators.select(upred)
Operators.bidirectional_chain(ChainSilhouetteIterator(), NotUP1D(upred))
shaders_list = [
- TextureAssignerShader(-1),
ConstantThicknessShader(5),
ConstantColorShader(0.0, 0.0, 0.0),
]
diff --git a/release/scripts/freestyle/styles/qi0_not_external_contour.py b/release/scripts/freestyle/styles/qi0_not_external_contour.py
index fb3e327..3c9b887 100644
--- a/release/scripts/freestyle/styles/qi0_not_external_contour.py
+++ b/release/scripts/freestyle/styles/qi0_not_external_contour.py
@@ -36,7 +36,6 @@ from freestyle.shaders import (
IncreasingThicknessShader,
SamplingShader,
SpatialNoiseShader,
- TextureAssignerShader,
)
from freestyle.types import Operators
@@ -50,6 +49,5 @@ shaders_list = [
IncreasingThicknessShader(2, 5),
BackboneStretcherShader(20),
IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1),
- TextureAssignerShader(4),
]
Operators.create(TrueUP1D(), shaders_list)
diff --git a/release/scripts/freestyle/styles/sequentialsplit_sketchy.py b/release/scripts/freestyle/styles/sequentialsplit_sketchy.py
index e97e8f6..b980fdc 100644
--- a/release/scripts/freestyle/styles/sequentialsplit_sketchy.py
+++ b/release/scripts/freestyle/styles/sequentialsplit_sketchy.py
@@ -35,7 +35,6 @@ from freestyle.shaders import (
ConstantColorShader,
IncreasingThicknessShader,
SpatialNoiseShader,
- TextureAssignerShader,
)
from freestyle.types import Nature, Operators
@@ -51,6 +50,5 @@ 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)
diff --git a/release/scripts/freestyle/styles/sketchy_multiple_parameterization.py b/release/scripts/freestyle/styles/sketchy_multiple_parameterization.py
index 0beb6e3..a3ce611 100644
--- a/release/scripts/freestyle/styles/sketchy_multiple_parameterization.py
+++ b/release/scripts/freestyle/styles/sketchy_multiple_parameterization.py
@@ -34,7 +34,6 @@ from freestyle.shaders import (
SamplingShader,
SmoothingShader,
SpatialNoiseShader,
- TextureAssignerShader,
pyHLRShader,
)
from freestyle.types import Operators
@@ -48,7 +47,6 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list