diff --git a/svg_invisible.py b/svg_invisible.py index b6538ab..9a60ba6 100644 --- a/svg_invisible.py +++ b/svg_invisible.py @@ -4,6 +4,7 @@ import os import re +import bpy from freestyle import * from freestyle.functions import * from freestyle.predicates import * @@ -49,13 +50,11 @@ f.close() # select -preds = [ - pyNatureUP1D(Nature.SILHOUETTE), - pyNatureUP1D(Nature.CREASE), - ContourUP1D() -] -upred = join_unary_predicates(preds, OrUP1D) -upred = AndUP1D(NotUP1D(QuantitativeInvisibilityUP1D(0)), upred) +upred = AndUP1D(NotUP1D(QuantitativeInvisibilityUP1D(0)), + OrUP1D(pyNatureUP1D(Nature.SILHOUETTE), + pyNatureUP1D(Nature.CREASE), + ContourUP1D())) + Operators.select(upred) # chain diff --git a/svg_object_fill.py b/svg_object_fill.py index 9458ad3..573713c 100644 --- a/svg_object_fill.py +++ b/svg_object_fill.py @@ -48,11 +48,8 @@ f.close() # select -preds = [ - ContourUP1D(), - NotUP1D(pyIsOccludedByItselfUP1D()) -] -upred = join_unary_predicates(preds, AndUP1D) +upred = AndUP1D(ContourUP1D(), NotUP1D(pyIsOccludedByItselfUP1D())) + Operators.select(upred) # chain diff --git a/svg_visible.py b/svg_visible.py index ae9c44b..629dd37 100644 --- a/svg_visible.py +++ b/svg_visible.py @@ -4,6 +4,7 @@ import os import re +import bpy from freestyle import * from freestyle.functions import * from freestyle.predicates import * @@ -50,13 +51,12 @@ # select -preds = [ - pyNatureUP1D(Nature.SILHOUETTE), - pyNatureUP1D(Nature.CREASE), - ContourUP1D() -] -upred = join_unary_predicates(preds, OrUP1D) -upred = AndUP1D(QuantitativeInvisibilityUP1D(0), upred) + +upred = AndUP1D(QuantitativeInvisibilityUP1D(0), + OrUP1D(pyNatureUP1D(Nature.SILHOUETTE), + pyNatureUP1D(Nature.CREASE), + ContourUP1D())) + Operators.select(upred) # chain diff --git a/svg_visible_advanced.py b/svg_visible_advanced.py index acce11b..ad97697 100644 --- a/svg_visible_advanced.py +++ b/svg_visible_advanced.py @@ -4,6 +4,7 @@ import os import re +import bpy from freestyle import * from freestyle.functions import * from freestyle.predicates import * @@ -46,13 +47,11 @@ # select -preds = [ - pyNatureUP1D(Nature.SILHOUETTE), - pyNatureUP1D(Nature.CREASE), - ContourUP1D() -] -upred = join_unary_predicates(preds, OrUP1D) -upred = AndUP1D(QuantitativeInvisibilityUP1D(0), upred) +upred = AndUP1D(QuantitativeInvisibilityUP1D(0), + OrUP1D(pyNatureUP1D(Nature.SILHOUETTE), + pyNatureUP1D(Nature.CREASE), + ContourUP1D())) + Operators.select(upred) # chain