forked from bartvdbraak/blender
missed out with 2 active layers that should be active_rnd
This commit is contained in:
parent
d7235265fe
commit
a8756ba013
@ -334,7 +334,7 @@ static void fastshade_customdata(CustomData *fdata, int a, int j, Material *ma)
|
|||||||
layer= &fdata->layers[index];
|
layer= &fdata->layers[index];
|
||||||
|
|
||||||
if(needuv && layer->type == CD_MTFACE && shi.totuv < MAX_MTFACE) {
|
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];
|
mtface= &((MTFace*)layer->data)[a];
|
||||||
|
|
||||||
shi.uv[shi.totuv].uv[0]= 2.0f*mtface->uv[j][0]-1.0f;
|
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++;
|
shi.totuv++;
|
||||||
}
|
}
|
||||||
else if(layer->type == CD_MCOL && shi.totcol < MAX_MCOL) {
|
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];
|
vertcol= (char*)&((MCol*)layer->data)[a*4 + j];
|
||||||
|
|
||||||
shi.col[shi.totcol].col[0]= ((float)vertcol[3])/255.0f;
|
shi.col[shi.totcol].col[0]= ((float)vertcol[3])/255.0f;
|
||||||
|
@ -429,11 +429,11 @@ void RE_vlakren_set_customdata_names(Render *re, CustomData *data)
|
|||||||
layer= &data->layers[i];
|
layer= &data->layers[i];
|
||||||
|
|
||||||
if (layer->type == CD_MTFACE) {
|
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);
|
strcpy(cdn->mtface[n], layer->name);
|
||||||
}
|
}
|
||||||
else if (layer->type == CD_MCOL) {
|
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);
|
strcpy(cdn->mcol[n], layer->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user