[Bf-blender-cvs] [bae1ff4] cycles-ptex-06: Fix need for manually creating uv layer

[Nicholas Bishop]

Commit: bae1ff4c4361ec502fafdaa1ef6eb2b288cf2019
Author: Nicholas Bishop
Date:   Wed Jan 7 21:42:54 2015 +0100
Branches: cycles-ptex-06
https://developer.blender.org/rBbae1ff4c4361ec502fafdaa1ef6eb2b288cf2019

Fix need for manually creating uv layer

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

M	source/blender/blenkernel/intern/customdata.c
M	source/blender/blenkernel/intern/mesh.c
M	source/blender/blenkernel/intern/mesh_evaluate.c

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

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 841417d..6412932 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -2421,7 +2421,7 @@ void CustomData_from_bmeshpoly(CustomData *fdata, CustomData *pdata, CustomData
 			CustomData_add_layer_named(fdata, CD_TESSLOOPNORMAL, CD_CALLOC, NULL, total, ldata->layers[i].name);
 		}
 		else if (ldata->layers[i].type == CD_PTEX_UV) {
-			//CustomData_add_layer_named(fdata, CD_MTFACE, CD_CALLOC, NULL, total, ldata->layers[i].name);
+			CustomData_add_layer_named(fdata, CD_MTFACE, CD_CALLOC, NULL, total, ldata->layers[i].name);
 			// TODO
 			CustomData_set_layer_active(fdata, CD_MTFACE, 0);
 			CustomData_set_layer_render(fdata, CD_MTFACE, 0);
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index fa44806..add4d7d 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -311,7 +311,8 @@ static void mesh_ensure_tessellation_customdata(Mesh *me)
 		 * Callers could also check but safer to do here - campbell */
 	}
 	else {
-		const int tottex_original = CustomData_number_of_layers(&me->pdata, CD_MTEXPOLY);
+		const int tottex_original = (CustomData_number_of_layers(&me->pdata, CD_MTEXPOLY) +
+		                             CustomData_number_of_layers(&me->ldata, CD_PTEX_UV));
 		const int totcol_original = CustomData_number_of_layers(&me->ldata, CD_MLOOPCOL);
 
 		const int tottex_tessface = CustomData_number_of_layers(&me->fdata, CD_MTFACE);
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c
index a38598c..2791a55 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -1350,7 +1350,7 @@ void BKE_mesh_loops_to_tessdata(CustomData *fdata, CustomData *ldata, CustomData
 			// TODO, stole from customdata.c 
 			MTFace default_tf = {{{0, 0}, {1, 0}, {1, 1}, {0, 1}}, NULL, 
 								 0, 0, TF_DYNAMIC | TF_CONVERTED, 0, 0}; 
-			//(*texface) = default_tf; 
+			(*texface) = default_tf; 
 			for (j = (mface ? mface[findex].v4 : (*lidx)[3]) ? 4 : 3; j--;) {  
 				copy_v2_v2(texface->uv[j], ptex_uv[(*lidx)[j]].uv);  
 			}