Page MenuHome
Differential D14365 Diff 59272 source/blender/draw/intern/draw_manager_data.cc

Changeset View

Standalone View

View Options

source/blender/draw/intern/draw_manager_data.cc

Show First 20 Lines • Show All 1,416 Lines • ▼ Show 20 Lines if (layer) {
attrs[attrs_num].domain = domain; attrs[attrs_num].domain = domain;
BLI_strncpy(attrs[attrs_num].name, layer->name, sizeof(attrs[attrs_num].name)); BLI_strncpy(attrs[attrs_num].name, layer->name, sizeof(attrs[attrs_num].name));
attrs_num++; attrs_num++;
} }
} }
if (use_uv) { if (use_uv) {
int layer_i = CustomData_get_active_layer_index(&me->ldata, CD_MLOOPUV); int layer_i = CustomData_get_active_layer_index(&me->ldata, CD_PROP_FLOAT2);
if (layer_i != -1) { if (layer_i != -1) {
CustomDataLayer *layer = me->ldata.layers + layer_i; CustomDataLayer *layer = me->ldata.layers + layer_i;
attrs[attrs_num].type = CD_MLOOPUV; attrs[attrs_num].type = CD_PROP_FLOAT2;
attrs[attrs_num].domain = ATTR_DOMAIN_CORNER; attrs[attrs_num].domain = ATTR_DOMAIN_CORNER;
BLI_strncpy(attrs[attrs_num].name, layer->name, sizeof(attrs[attrs_num].name)); BLI_strncpy(attrs[attrs_num].name, layer->name, sizeof(attrs[attrs_num].name));
attrs_num++; attrs_num++;
} }
} }
scd.attrs = attrs; scd.attrs = attrs;
Show All 40 Lines for (int i = 0; i < draw_attrs.num_requests; i++) {
attrs_i++; attrs_i++;
} }
/* UV maps are not in attribute requests. */ /* UV maps are not in attribute requests. */
Mesh *me = (Mesh *)ob->data; Mesh *me = (Mesh *)ob->data;
for (uint i = 0; i < 32; i++) { for (uint i = 0; i < 32; i++) {
if (cd_needed.uv & (1 << i)) { if (cd_needed.uv & (1 << i)) {
int layer_i = CustomData_get_layer_index_n(&me->ldata, CD_MLOOPUV, i); int layer_i = CustomData_get_layer_index_n(&me->ldata, CD_PROP_FLOAT2, i);
CustomDataLayer *layer = layer_i != -1 ? me->ldata.layers + layer_i : nullptr; CustomDataLayer *layer = layer_i != -1 ? me->ldata.layers + layer_i : nullptr;
if (layer) { if (layer) {
attrs[attrs_i].type = CD_MLOOPUV; attrs[attrs_i].type = CD_PROP_FLOAT2;
attrs[attrs_i].domain = ATTR_DOMAIN_CORNER; attrs[attrs_i].domain = ATTR_DOMAIN_CORNER;
BLI_strncpy(attrs[attrs_i].name, layer->name, sizeof(PBVHAttrReq::name)); BLI_strncpy(attrs[attrs_i].name, layer->name, sizeof(PBVHAttrReq::name));
attrs_i++; attrs_i++;
} }
} }
} }
attrs_num = attrs_i; attrs_num = attrs_i;
▲ Show 20 Lines • Show All 1,045 Lines • Show Last 20 Lines