[Bf-blender-cvs] [44af138b279] refactor-mesh-uv-map-generic: Change some CD_MLOOPUVs to CD_PROP_FLOAT2
Martijn Versteegh
noreply at git.blender.org
Wed Nov 16 22:13:31 CET 2022
Commit: 44af138b2797297d882f269cbb32593c66e90550
Author: Martijn Versteegh
Date: Wed Nov 16 21:36:22 2022 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB44af138b2797297d882f269cbb32593c66e90550
Change some CD_MLOOPUVs to CD_PROP_FLOAT2
During merging some CD_MLOOPUVs crept back in because I forgot
to check for the expected number of CD_MLOOPUVs in the source tree.
===================================================================
M source/blender/blenloader/intern/versioning_defaults.cc
M source/blender/bmesh/intern/bmesh_query_uv.cc
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_manager_data.cc
M source/blender/draw/intern/draw_pbvh.cc
M source/blender/editors/mesh/editface.cc
M source/blender/editors/mesh/mesh_data.cc
M source/blender/editors/object/object_bake.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_defaults.cc b/source/blender/blenloader/intern/versioning_defaults.cc
index 3d924bc9c05..940596ed976 100644
--- a/source/blender/blenloader/intern/versioning_defaults.cc
+++ b/source/blender/blenloader/intern/versioning_defaults.cc
@@ -350,7 +350,7 @@ static void blo_update_defaults_scene(Main *bmain, Scene *scene)
/* Correct default startup UV's. */
Mesh *me = static_cast<Mesh *>(BLI_findstring(&bmain->meshes, "Cube", offsetof(ID, name) + 2));
- if (me && (me->totloop == 24) && CustomData_has_layer(&me->ldata, CD_MLOOPUV)) {
+ if (me && (me->totloop == 24) && CustomData_has_layer(&me->ldata, CD_PROP_FLOAT2)) {
const float uv_values[24][2] = {
{0.625, 0.50}, {0.875, 0.50}, {0.875, 0.75}, {0.625, 0.75}, {0.375, 0.75}, {0.625, 0.75},
{0.625, 1.00}, {0.375, 1.00}, {0.375, 0.00}, {0.625, 0.00}, {0.625, 0.25}, {0.375, 0.25},
diff --git a/source/blender/bmesh/intern/bmesh_query_uv.cc b/source/blender/bmesh/intern/bmesh_query_uv.cc
index 2bc24078bad..443980df84a 100644
--- a/source/blender/bmesh/intern/bmesh_query_uv.cc
+++ b/source/blender/bmesh/intern/bmesh_query_uv.cc
@@ -24,7 +24,7 @@ BMUVOffsets BM_uv_map_get_offsets(const BMesh *bm)
{
using namespace blender;
using namespace blender::bke;
- const int layer_index = CustomData_get_layer_index(&bm->ldata, CD_PROP_FLOAT2);
+ const int layer_index = CustomData_get_active_layer_index(&bm->ldata, CD_PROP_FLOAT2);
if (layer_index == -1) {
return {-1, -1, -1, -1};
}
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index 00ac2563c43..f1f62d8aee9 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -3371,7 +3371,7 @@ void DRW_cdlayer_attr_aliases_add(GPUVertFormat *format,
/* Active render layer name. */
if (is_active_render) {
- GPU_vertformat_alias_add(format, cl->type == CD_MLOOPUV ? "a" : base_name);
+ GPU_vertformat_alias_add(format, cl->type == CD_PROP_FLOAT2 ? "a" : base_name);
}
/* Active display layer name. */
diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc
index beeff6f35c2..b398acd9aab 100644
--- a/source/blender/draw/intern/draw_manager_data.cc
+++ b/source/blender/draw/intern/draw_manager_data.cc
@@ -1420,11 +1420,11 @@ void DRW_shgroup_call_sculpt(DRWShadingGroup *shgroup,
}
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) {
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;
BLI_strncpy(attrs[attrs_num].name, layer->name, sizeof(attrs[attrs_num].name));
@@ -1481,11 +1481,11 @@ void DRW_shgroup_call_sculpt_with_materials(DRWShadingGroup **shgroups,
for (uint i = 0; i < 32; 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;
if (layer) {
- attrs[attrs_i].type = CD_MLOOPUV;
+ attrs[attrs_i].type = CD_PROP_FLOAT2;
attrs[attrs_i].domain = ATTR_DOMAIN_CORNER;
BLI_strncpy(attrs[attrs_i].name, layer->name, sizeof(PBVHAttrReq::name));
attrs_i++;
diff --git a/source/blender/draw/intern/draw_pbvh.cc b/source/blender/draw/intern/draw_pbvh.cc
index 3ae673f556a..cfae4275294 100644
--- a/source/blender/draw/intern/draw_pbvh.cc
+++ b/source/blender/draw/intern/draw_pbvh.cc
@@ -889,7 +889,7 @@ struct PBVHBatches {
}
else {
switch (type) {
- case CD_MLOOPUV:
+ case CD_PROP_FLOAT2:
prefix = "u";
break;
default:
diff --git a/source/blender/editors/mesh/editface.cc b/source/blender/editors/mesh/editface.cc
index 1c6d1747516..69033348d26 100644
--- a/source/blender/editors/mesh/editface.cc
+++ b/source/blender/editors/mesh/editface.cc
@@ -379,7 +379,7 @@ bool paintface_minmax(Object *ob, float r_min[3], float r_max[3])
float vec[3], bmat[3][3];
const Mesh *me = BKE_mesh_from_object(ob);
- if (!me || !CustomData_has_layer(&me->ldata, CD_MLOOPUV)) {
+ if (!me || !CustomData_has_layer(&me->ldata, CD_PROP_FLOAT2)) {
return ok;
}
diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc
index f6d16acdb2d..249034de2d2 100644
--- a/source/blender/editors/mesh/mesh_data.cc
+++ b/source/blender/editors/mesh/mesh_data.cc
@@ -268,7 +268,7 @@ int ED_mesh_uv_add(
CustomData_add_layer_named(&me->ldata,
CD_PROP_FLOAT2,
CD_DUPLICATE,
- CustomData_get_layer(&me->ldata, CD_MLOOPUV),
+ CustomData_get_layer(&me->ldata, CD_PROP_FLOAT2),
me->totloop,
name);
is_init = true;
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index 91641de1605..46dd6132bbb 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -155,7 +155,7 @@ static bool multiresbake_check(bContext *C, wmOperator *op)
break;
}
- if (!CustomData_has_layer(&me->ldata, CD_MLOOPUV)) {
+ if (!CustomData_has_layer(&me->ldata, CD_PROP_FLOAT2)) {
BKE_report(op->reports, RPT_ERROR, "Mesh should be unwrapped before multires data baking");
ok = false;
More information about the Bf-blender-cvs
mailing list