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>2012-04-07 22:16:25 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-04-07 22:16:25 +0400
commit67f5ad506ba0409b82e2af34bbd7084bafaf7119 (patch)
treeb3d3e9d5bfc34cd53644430b068d9303f296926e /release/scripts/freestyle/style_modules
parente94abda66dae7d01260839a7c5c5ff271f3ae33d (diff)
Fix for untested portions in the last commit concerning thickness position options.
Diffstat (limited to 'release/scripts/freestyle/style_modules')
-rw-r--r--release/scripts/freestyle/style_modules/parameter_editor.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/release/scripts/freestyle/style_modules/parameter_editor.py b/release/scripts/freestyle/style_modules/parameter_editor.py
index caf262e1397..cb91913c1b1 100644
--- a/release/scripts/freestyle/style_modules/parameter_editor.py
+++ b/release/scripts/freestyle/style_modules/parameter_editor.py
@@ -118,15 +118,17 @@ class ThicknessBlenderMixIn(ThicknessModifierMixIn):
self.__ratio = ratio
def blend_thickness(self, outer, inner, v):
if self.__position == "CENTER":
- outer = self.__modifier.blend(outer, v / 2)
- inner = self.__modifier.blend(inner, v / 2)
+ outer = self.blend(outer, v / 2)
+ inner = self.blend(inner, v / 2)
elif self.__position == "INSIDE":
- inner = self.__modifier.blend(inner, v)
+ outer = self.blend(outer, 0)
+ inner = self.blend(inner, v)
elif self.__position == "OUTSIDE":
- outer = self.__modifier.blend(outer, v)
+ outer = self.blend(outer, v)
+ inner = self.blend(inner, 0)
elif self.__position == "RELATIVE":
- outer = self.__modifier.blend(outer, v * self.ratio)
- inner = self.__modifier.blend(inner, v * (1 - self.ratio))
+ outer = self.blend(outer, v * self.__ratio)
+ inner = self.blend(inner, v * (1 - self.__ratio))
else:
raise ValueError("unknown thickness position: " + self.__position)
return outer, inner