[Bf-blender-cvs] [9734ae5] cycles-ptex-12: Tesselation for Ptex loop layer

Nicholas Bishop noreply at git.blender.org
Mon Jan 26 02:04:43 CET 2015


Commit: 9734ae5747a0264f101ba68d525e92b40d6b723e
Author: Nicholas Bishop
Date:   Mon Jan 19 16:01:56 2015 +0100
Branches: cycles-ptex-12
https://developer.blender.org/rB9734ae5747a0264f101ba68d525e92b40d6b723e

Tesselation for Ptex loop layer

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

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

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

diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c
index bdc8cd2..4f19589 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -1325,6 +1325,7 @@ void BKE_mesh_loops_to_tessdata(CustomData *fdata, CustomData *ldata, CustomData
 	const bool hasPCol = CustomData_has_layer(ldata, CD_PREVIEW_MLOOPCOL);
 	const bool hasOrigSpace = CustomData_has_layer(ldata, CD_ORIGSPACE_MLOOP);
 	const bool hasLoopNormal = CustomData_has_layer(ldata, CD_NORMAL);
+	const bool hasPtex = CustomData_has_layer(ldata, CD_LOOP_PTEX_UV);
 	int findex, i, j;
 	const int *pidx;
 	unsigned int (*lidx)[4];
@@ -1389,6 +1390,17 @@ void BKE_mesh_loops_to_tessdata(CustomData *fdata, CustomData *ldata, CustomData
 			}
 		}
 	}
+
+	if (hasPtex) {
+		MTessFacePtex *dst = CustomData_get_layer(fdata, CD_TESSFACE_PTEX);
+		const MLoopPtexUV *src = CustomData_get_layer(ldata, CD_LOOP_PTEX_UV);
+
+		for (findex = 0, lidx = loopindices; findex < num_faces; lidx++, findex++, dst++) {
+			for (j = (mface ? mface[findex].v4 : (*lidx)[3]) ? 4 : 3; j--;) {
+				dst->corners[j] = src[(*lidx)[j]];
+			}
+		}
+	}
 }
 
 /**




More information about the Bf-blender-cvs mailing list