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>2013-06-16 04:15:05 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-06-16 04:15:05 +0400
commit865096919dd2a267ac0f1cec805abc05c81045bf (patch)
tree49c2ae857fa0a48b08fb49f1b2bc63cd05ebd555 /release
parentbc9121f627b107f05ed1d373390d6a432c2ec5d9 (diff)
Fixed the feature edge selection by Freestyle face marks to properly account for border edges.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/freestyle/style_modules/parameter_editor.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/release/scripts/freestyle/style_modules/parameter_editor.py b/release/scripts/freestyle/style_modules/parameter_editor.py
index 6b7f57cbce1..71cfdce43f0 100644
--- a/release/scripts/freestyle/style_modules/parameter_editor.py
+++ b/release/scripts/freestyle/style_modules/parameter_editor.py
@@ -885,6 +885,9 @@ class FaceMarkBothUP1D(UnaryPredicate1D):
if fe.is_smooth:
if fe.face_mark:
return True
+ elif (fe.nature & Nature.BORDER):
+ if fe.face_mark_left:
+ return True
else:
if fe.face_mark_right and fe.face_mark_left:
return True
@@ -898,6 +901,9 @@ class FaceMarkOneUP1D(UnaryPredicate1D):
if fe.is_smooth:
if fe.face_mark:
return True
+ elif (fe.nature & Nature.BORDER):
+ if fe.face_mark_left:
+ return True
else:
if fe.face_mark_right or fe.face_mark_left:
return True