blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Partial fix for T44404: freestyle crashes blender. 

Logical predicates AndUP1D and OrUP1D were instantiated even with an empty
list of unary 1D predicates, causing an exception in the constructors of
the logical predicate classes.

This is a regression made in b408d8af31.
This commit is contained in:
Tamito Kajiyama 2015-04-16 09:13:40 +09:00
parent b88421aa62
commit b466a82fa5
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
release/scripts/freestyle/modules/parameter_editor.py
View File

@ -960,11 +960,11 @@ def process(layer_name, lineset_name):
if lineset.select_external_contour:
upred = ExternalContourUP1D()
edge_type_criteria.append(NotUP1D(upred) if lineset.exclude_external_contour else upred)
if lineset.edge_type_combination == 'OR':
upred = OrUP1D(*edge_type_criteria)
else:
upred = AndUP1D(*edge_type_criteria)
if upred is not None:
if edge_type_criteria:
if lineset.edge_type_combination == 'OR':
upred = OrUP1D(*edge_type_criteria)
else:
upred = AndUP1D(*edge_type_criteria)
if lineset.edge_type_negation == 'EXCLUSIVE':
upred = NotUP1D(upred)
selection_criteria.append(upred)
@ -989,8 +989,9 @@ def process(layer_name, lineset_name):
upred = WithinImageBoundaryUP1D(*ContextFunctions.get_border())
selection_criteria.append(upred)
# select feature edges
upred = AndUP1D(*selection_criteria)
if upred is None:
if selection_criteria:
upred = AndUP1D(*selection_criteria)
else:
upred = TrueUP1D()
Operators.select(upred)
# join feature edges to form chains