Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-06-06 22:18:39 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-06-06 22:18:39 +0400
commitad2f4905301854f07d59bc290488da7ce4e7df57 (patch)
tree9a840e1fb022fc1c20ce9fd88a60510dedc388c9 /source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
parentca6f7ddd991940d6d26162e242a70c232475a3d2 (diff)
Fix for a crash related to the feature edge detection at material boundaries.
Diffstat (limited to 'source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp')
-rwxr-xr-xsource/blender/freestyle/intern/view_map/FEdgeXDetector.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
index aca7334d045..16c38c63813 100755
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
@@ -700,7 +700,9 @@ void FEdgeXDetector::processMaterialBoundaryShape(WXShape* iWShape) {
void FEdgeXDetector::ProcessMaterialBoundaryEdge(WXEdge *iEdge)
{
// check whether the edge is a material boundary?
- if(iEdge->GetaFace()->frs_materialIndex() != iEdge->GetbFace()->frs_materialIndex()){
+ WFace *aFace = iEdge->GetaFace();
+ WFace *bFace = iEdge->GetbFace();
+ if(aFace && bFace && aFace->frs_materialIndex() != bFace->frs_materialIndex()){
iEdge->AddNature(Nature::MATERIAL_BOUNDARY);
}
}