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
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2017-09-20 20:24:18 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-09-20 20:38:08 +0300
commit14223357e593c05c27883a82cfdb39097d0fd9a7 (patch)
treeb7eab346ed0f970b2db6df5f0bf0d289d0f62a98 /intern
parent90d4b823d72922922bb3d0af48ec2f592d210cdd (diff)
Fix T52853: harmless Cycles test failure in debug mode.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_mesh.cpp5
1 files changed, 2 insertions, 3 deletions
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;