[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14853] trunk/blender/source/blender:

Brecht Van Lommel brechtvanlommel at pandora.be
Thu May 15 21:40:09 CEST 2008


Revision: 14853
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14853
Author:   blendix
Date:     2008-05-15 21:40:09 +0200 (Thu, 15 May 2008)

Log Message:
-----------

Fix for bug #11650: removing uv layers in editmode did not work correct.
Fix for bug #11661: bake to viewport uv layer instead of render uv layer.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/customdata.c
    trunk/blender/source/blender/render/intern/include/render_types.h
    trunk/blender/source/blender/render/intern/source/rendercore.c
    trunk/blender/source/blender/render/intern/source/renderdatabase.c

Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c	2008-05-15 19:35:17 UTC (rev 14852)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c	2008-05-15 19:40:09 UTC (rev 14853)
@@ -1241,7 +1241,8 @@
 		if(dest_i >= dest->totlayer) return;
 
 		/* if we found a matching layer, copy the data */
-		if(dest->layers[dest_i].type == source->layers[src_i].type) {
+		if(dest->layers[dest_i].type == source->layers[src_i].type &&
+			strcmp(dest->layers[dest_i].name, source->layers[src_i].name) == 0) {
 			char *src_data = (char*)src_block + source->layers[src_i].offset;
 			char *dest_data = (char*)*dest_block + dest->layers[dest_i].offset;
 

Modified: trunk/blender/source/blender/render/intern/include/render_types.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/render_types.h	2008-05-15 19:35:17 UTC (rev 14852)
+++ trunk/blender/source/blender/render/intern/include/render_types.h	2008-05-15 19:40:09 UTC (rev 14853)
@@ -265,7 +265,7 @@
 
 	char (*mtface)[32];
 	char (*mcol)[32];
-	int  actmtface, actmcol;
+	int  actmtface, actmcol, bakemtface;
 
 	float obmat[4][4];	/* only used in convertblender.c, for instancing */
 } ObjectRen;

Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c	2008-05-15 19:35:17 UTC (rev 14852)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c	2008-05-15 19:40:09 UTC (rev 14853)
@@ -2346,7 +2346,7 @@
 			vlr= RE_findOrAddVlak(obr, v);
 
 			if((bs->actob && bs->actob == obr->ob) || (!bs->actob && (obr->ob->flag & SELECT))) {
-				tface= RE_vlakren_get_tface(obr, vlr, obr->actmtface, NULL, 0);
+				tface= RE_vlakren_get_tface(obr, vlr, obr->bakemtface, NULL, 0);
 
 				if(tface && tface->tpage) {
 					Image *ima= tface->tpage;
@@ -2400,7 +2400,7 @@
 	VlakRen *vlr= bs->vlr;
 	ObjectInstanceRen *obi= bs->obi;
 	ObjectRen *obr= obi->obr;
-	MTFace *tface= RE_vlakren_get_tface(obr, vlr, obr->actmtface, NULL, 0);
+	MTFace *tface= RE_vlakren_get_tface(obr, vlr, obr->bakemtface, NULL, 0);
 	Image *ima= tface->tpage;
 	float vec[4][2];
 	int a, i1, i2, i3;

Modified: trunk/blender/source/blender/render/intern/source/renderdatabase.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/renderdatabase.c	2008-05-15 19:35:17 UTC (rev 14852)
+++ trunk/blender/source/blender/render/intern/source/renderdatabase.c	2008-05-15 19:40:09 UTC (rev 14853)
@@ -501,6 +501,7 @@
 		if (layer->type == CD_MTFACE) {
 			strcpy(obr->mtface[mtfn++], layer->name);
 			obr->actmtface= layer->active_rnd;
+			obr->bakemtface= layer->active;
 		}
 		else if (layer->type == CD_MCOL) {
 			strcpy(obr->mcol[mcn++], layer->name);





More information about the Bf-blender-cvs mailing list