diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-11-04 16:47:11 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-11-04 16:47:11 +0300 |
| commit | fde6fc6dd44061dfa67121d59931aa68c9c4473b (patch) | |
| tree | 168069ce8158ac22a9dd975836e7d475723f4c0e /intern/boolop | |
| parent | d471d2633c86d88f450c2849d6fed91aa54fc34f (diff) | |
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!
Diffstat (limited to 'intern/boolop')
| -rw-r--r-- | intern/boolop/intern/BOP_Material.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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... */ } /** |