[Bf-blender-cvs] [bf5ddb9] master: Fix T47198: Broken UV/VCol in BI and Cycles with some degenerated faces - BI part.

[Bastien Montagne]

Commit: bf5ddb9728ef3eeed680399ab4d0f7aa59fe1fa4
Author: Bastien Montagne
Date:   Wed Jan 20 10:03:14 2016 +0100
Branches: master
https://developer.blender.org/rBbf5ddb9728ef3eeed680399ab4d0f7aa59fe1fa4

Fix T47198: Broken UV/VCol in BI and Cycles with some degenerated faces - BI part.

Problem is actually similar in both engines - in some cases, we changed
'natural' quad splitting order to alternative one, without properkly 'notifying'
UV/VCol/other tessface data about it.

So code would use a 'wrong' triangle of UVs etc.

Fix for Cycles was committed by sergey as rBa6eae7339190d1.

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

M	source/blender/render/intern/source/convertblender.c

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

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 1cd8e25..1e5e902 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -4252,6 +4252,7 @@ static void check_non_flat_quads(ObjectRen *obr)
 				vlr->v2= v3;
 				vlr->v3= v4;
 				vlr->v4= NULL;
+				vlr->flag |= (R_DIVIDE_24 | R_FACE_SPLIT);
 			}
 			else {
 				sub_v3_v3v3(nor, v2->co, v3->co);
@@ -4259,6 +4260,7 @@ static void check_non_flat_quads(ObjectRen *obr)
 					vlr->v2= v3;
 					vlr->v3= v4;
 					vlr->v4= NULL;
+					vlr->flag |= R_FACE_SPLIT;
 				}
 				else {
 					sub_v3_v3v3(nor, v3->co, v4->co);