[Bf-blender-cvs] [14223357e59] master: Fix T52853: harmless Cycles test failure in debug mode.

[Brecht Van Lommel]

Commit: 14223357e593c05c27883a82cfdb39097d0fd9a7
Author: Brecht Van Lommel
Date:   Wed Sep 20 19:24:18 2017 +0200
Branches: master
https://developer.blender.org/rB14223357e593c05c27883a82cfdb39097d0fd9a7

Fix T52853: harmless Cycles test failure in debug mode.

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

M	intern/cycles/blender/blender_mesh.cpp

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

diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index ba95fd84e86..b1060beb484 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -63,9 +63,8 @@ inline void face_split_tri_indices(const int face_flag,
 		tri_b[1] = 3;
 		tri_b[2] = 1;
 	}
-	else /*if(face_flag & FACE_FLAG_DIVIDE_13)*/ {
-		assert(face_flag & FACE_FLAG_DIVIDE_13);
-
+	else {
+		/* Quad with FACE_FLAG_DIVIDE_13 or single triangle. */
 		tri_a[0] = 0;
 		tri_a[1] = 1;
 		tri_a[2] = 2;