* Fix for a freeze issue in stroke rendering when using round/square caps.

The problem was caused by a stroke with only one vertex.  Such a stroke was
generated when for some unknown reason a chained curve consisted of only
two vertices such that their 3D positions were exactly or almost the same.

* Fix for the Parameter Editor mode that failed when scene render layers
and/or linesets contain a single quote in their names.

1 files changed, 5 insertions, 0 deletions

diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp
index ea996c67785..4f6fb08fa0e 100755
--- a/source/blender/freestyle/intern/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
@@ -979,6 +979,11 @@ Stroke* createStroke(Interface1D& inter) {
       stroke->push_back(stroke_vertex);
     }
   }
+  // Discard the stroke if the number of stroke vertices is less than two
+  if (stroke->strokeVerticesSize() < 2) {
+    delete stroke;
+    return NULL;
+  }
   stroke->setLength(currentCurvilignAbscissa);
   return stroke;
 }