Hopefully a working merge with trunk (could be one error left in raytrace.c - will...
[blender.git] / source / blender / render / intern / source / raytrace.c
index 09d3711885afc4a72f3f4c759a34b65d91ed012d..b34fe6a70397cdb0da79e677299099ece188be49 100644 (file)
@@ -931,7 +931,7 @@ int RE_ray_face_intersection(Isect *is, RayObjectTransformFunc transformfunc, Ra
                intersection to be detected in its neighbour face */
                
                if(is->facecontr && is->faceisect);     // optimizing, the tests below are not needed
-               else if(is->labda< .1) {
+               else if(is->labda< .1 && is->faceorig) {
                        RayFace *face= is->faceorig;
                        float *origv1, *origv2, *origv3, *origv4;
                        short de= 0;