Added names to UV and vertex color layers, and display them as a list.

Added support for multiple UVs in the render engine. This also involved
changing the way faces are stored, to allow data to be added optionally
per 256 faces, same as the existing system for vertices.

A UV layer can be specified in the Map Input panel and the Geometry node
by name. Leaving this field blank will default to the active UV layer.

Also added sharing of face selection and hiding between UV layers, and at
the same time improved syncing with editmode selection and hiding.

Still to do:
- Multi UV support for fastshade.
- Multires and NMesh preservation of multiple UV sets.

1 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/radiosity/intern/source/radrender.c b/source/blender/radiosity/intern/source/radrender.c
index d75b2536c1e..d0472a834af 100644
--- a/source/blender/radiosity/intern/source/radrender.c
+++ b/source/blender/radiosity/intern/source/radrender.c
@@ -95,7 +95,7 @@ static VlakRen *findshoot_rr(Render *re)
 	maxenergy= 0.0;
 	
 	for(a=0; a<re->totvlak; a++) {
-		if((a & 255)==0) vlr= re->blovl[a>>8]; else vlr++;
+		if((a & 255)==0) vlr= re->vlaknodes[a>>8].vlak; else vlr++;
 		if(vlr->radface) {
 			rf= vlr->radface;
 			rf->flag &= ~RAD_SHOOT;
@@ -129,7 +129,7 @@ static void backface_test_rr(Render *re, VlakRen *shoot)
 	
 	/* backface testing */
 	for(a=0; a<re->totvlak; a++) {
-		if((a & 255)==0) vlr= re->blovl[a>>8]; else vlr++;
+		if((a & 255)==0) vlr= re->vlaknodes[a>>8].vlak; else vlr++;
 		if(vlr->radface) {
 			if(vlr!=shoot) {
 				rf= vlr->radface;
@@ -151,7 +151,7 @@ static void clear_backface_test_rr(Render *re)
 	
 	/* backface flag clear */
 	for(a=0; a<re->totvlak; a++) {
-		if((a & 255)==0) vlr= re->blovl[a>>8]; else vlr++;
+		if((a & 255)==0) vlr= re->vlaknodes[a>>8].vlak; else vlr++;
 		
 		if(vlr->radface) {
 			rf= vlr->radface;
@@ -208,7 +208,7 @@ static void makeformfactors_rr(Render *re, VlakRen *shoot)
 	fp= RG.formfactors;
 
 	for(a=0; a<re->totvlak; a++) {
-		if((a & 255)==0) vlr= re->blovl[a>>8]; else vlr++;
+		if((a & 255)==0) vlr= re->vlaknodes[a>>8].vlak; else vlr++;
 		
 		if(vlr->radface) {
 			rf= vlr->radface;
@@ -236,7 +236,7 @@ static void applyformfactors_rr(Render *re, VlakRen *shoot)
 	fp= RG.formfactors;
 	
 	for(a=0; a<re->totvlak; a++) {
-		if((a & 255)==0) vlr= re->blovl[a>>8]; else vlr++;
+		if((a & 255)==0) vlr= re->vlaknodes[a>>8].vlak; else vlr++;
 		
 		if(vlr->radface) {
 			rf= vlr->radface;
@@ -327,7 +327,7 @@ static void initradfaces(Render *re)
 	
 	/* count first for fast malloc */
 	for(a=0; a<re->totvlak; a++) {
-		if((a & 255)==0) vlr= re->blovl[a>>8]; else vlr++;
+		if((a & 255)==0) vlr= re->vlaknodes[a>>8].vlak; else vlr++;
 		
 		if(vlr->mat->mode & MA_RADIO) {
 			if(vlr->mat->emit > 0.0) {
@@ -343,7 +343,7 @@ printf(" Rad elems: %d emittors %d\n", RG.totelem, RG.totpatch);
 	/* make/init radfaces */
 	rf=radfaces= MEM_callocN(RG.totelem*sizeof(RadFace), "radfaces");
 	for(a=0; a<re->totvlak; a++) {
-		if((a & 255)==0) vlr= re->blovl[a>>8]; else vlr++;
+		if((a & 255)==0) vlr= re->vlaknodes[a>>8].vlak; else vlr++;
 		
 		if(vlr->mat->mode & MA_RADIO) {
 			
@@ -419,7 +419,7 @@ static void make_vertex_rad_values(Render *re)
 
 	/* accumulate vertexcolors */
 	for(a=0; a<re->totvlak; a++) {
-		if((a & 255)==0) vlr= re->blovl[a>>8]; else vlr++;
+		if((a & 255)==0) vlr= re->vlaknodes[a>>8].vlak; else vlr++;
 		
 		if(vlr->radface) {
 			rf= vlr->radface;