[Bf-blender-cvs] [6c136a6] master: Freestyle: Fix for GetOccludeeF1D returning a one-element list containing None when it is supposed to return an empty list.

Tamito Kajiyama noreply at git.blender.org
Tue May 20 08:12:42 CEST 2014


Commit: 6c136a69b0bb097ce5f11aeee6ef6d2ba56cdf64
Author: Tamito Kajiyama
Date:   Mon May 19 21:37:07 2014 +0900
https://developer.blender.org/rB6c136a69b0bb097ce5f11aeee6ef6d2ba56cdf64

Freestyle: Fix for GetOccludeeF1D returning a one-element list containing None when it is supposed to return an empty list.

===================================================================

M	source/blender/freestyle/intern/view_map/Functions1D.cpp

===================================================================

diff --git a/source/blender/freestyle/intern/view_map/Functions1D.cpp b/source/blender/freestyle/intern/view_map/Functions1D.cpp
index f29da66..11e0cc3 100644
--- a/source/blender/freestyle/intern/view_map/Functions1D.cpp
+++ b/source/blender/freestyle/intern/view_map/Functions1D.cpp
@@ -198,7 +198,9 @@ int GetOccludeeF1D::operator()(Interface1D& inter)
 	ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter);
 	if (ve) {
 		ViewShape *aShape = ve->aShape();
-		shapesVector.push_back(aShape);
+		if (aShape) {
+			shapesVector.push_back(aShape);
+		}
 	}
 	else {
 		Interface0DIterator it = inter.verticesBegin(), itend = inter.verticesEnd();




More information about the Bf-blender-cvs mailing list