missed out with 2 active layers that should be active_rnd

2 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index b50f02b1f64..30a4c8c3433 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -334,7 +334,7 @@ static void fastshade_customdata(CustomData *fdata, int a, int j, Material *ma)
 		layer= &fdata->layers[index];
 		
 		if(needuv && layer->type == CD_MTFACE && shi.totuv < MAX_MTFACE) {
-			n= fastshade_customdata_layer_num(shi.totuv, layer->active);
+			n= fastshade_customdata_layer_num(shi.totuv, layer->active_rnd);
 			mtface= &((MTFace*)layer->data)[a];
 
 			shi.uv[shi.totuv].uv[0]= 2.0f*mtface->uv[j][0]-1.0f;
@@ -345,7 +345,7 @@ static void fastshade_customdata(CustomData *fdata, int a, int j, Material *ma)
 			shi.totuv++;
 		}
 		else if(layer->type == CD_MCOL && shi.totcol < MAX_MCOL) {
-			n= fastshade_customdata_layer_num(shi.totcol, layer->active);
+			n= fastshade_customdata_layer_num(shi.totcol, layer->active_rnd);
 			vertcol= (char*)&((MCol*)layer->data)[a*4 + j];
 
 			shi.col[shi.totcol].col[0]= ((float)vertcol[3])/255.0f;
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c
index 902d55adb97..57f0f689871 100644
--- a/source/blender/render/intern/source/renderdatabase.c
+++ b/source/blender/render/intern/source/renderdatabase.c
@@ -429,11 +429,11 @@ void RE_vlakren_set_customdata_names(Render *re, CustomData *data)
 		layer= &data->layers[i];
 
 		if (layer->type == CD_MTFACE) {
-			n= vlakren_remap_layer_num(mtfn++, layer->active);
+			n= vlakren_remap_layer_num(mtfn++, layer->active_rnd);
 			strcpy(cdn->mtface[n], layer->name);
 		}
 		else if (layer->type == CD_MCOL) {
-			n= vlakren_remap_layer_num(mcn++, layer->active);
+			n= vlakren_remap_layer_num(mcn++, layer->active_rnd);
 			strcpy(cdn->mcol[n], layer->name);
 		}
 	}