From fde6fc6dd44061dfa67121d59931aa68c9c4473b Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sat, 4 Nov 2006 13:47:11 +0000 Subject: [PATCH] Bugfix #4540 Boolean crashed when using vertexcolors or UVs. The fix is disputable... it just always returns a valid char * for "face vertex material", whatever that may be... this fix seems not to break anything. Also moved the report to Todo tracker, with message: -> Need new Boolean maintainer! --- intern/boolop/intern/BOP_Material.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intern/boolop/intern/BOP_Material.cpp b/intern/boolop/intern/BOP_Material.cpp index 96f24f11cdb..01892d2accc 100644 --- a/intern/boolop/intern/BOP_Material.cpp +++ b/intern/boolop/intern/BOP_Material.cpp @@ -140,7 +140,7 @@ char* BOP_Material::getOriginalFaceVertexMaterial(int originalFaceVertex) if (m_originalFaceVertices[i]==originalFaceVertex) b = true; else i++; } - return b ? getFaceVertexMaterial(i) : NULL; + return b ? getFaceVertexMaterial(i) : m_faceVertexMaterial; /* ton: NULL return crashes... */ } /**