Fix T48325: Data transfer modifier vertex group selector doesn't work with freestyle data.

Freestyle edge/face marks are (afaik) our only actual customdata bitflags... Original work
kinda assumed we had no such things. :P
This commit is contained in:
Bastien Montagne 2016-05-01 15:36:09 +02:00
parent 1422f0dd16
commit 4e4ff72d13
Notes: blender-bot 2023-02-14 08:24:12 +01:00
Referenced by issue #49010, Portals seem to be broken
Referenced by issue #48325, Data transfer modifier vertex group selector doesn't work with freestyle data
Referenced by issue #46860, Cycles Color space flexibility
1 changed files with 10 additions and 1 deletions

View File

@ -459,9 +459,18 @@ static void data_transfer_layersmapping_add_item_cd(
ListBase *r_map, const int cddata_type, const int mix_mode, const float mix_factor, const float *mix_weights,
void *data_src, void *data_dst, cd_datatransfer_interp interp, void *interp_data)
{
uint64_t data_flag = 0;
if (cddata_type == CD_FREESTYLE_EDGE) {
data_flag = FREESTYLE_EDGE_MARK;
}
else if (cddata_type == CD_FREESTYLE_FACE) {
data_flag = FREESTYLE_FACE_MARK;
}
data_transfer_layersmapping_add_item(
r_map, cddata_type, mix_mode, mix_factor, mix_weights, data_src, data_dst,
0, 0, 0, 0, 0, 0, interp, interp_data);
0, 0, 0, 0, 0, data_flag, interp, interp_data);
}
/* Note: All those layer mapping handlers return false *only* if they were given invalid parameters.