Commit: fee6059785e95179e5a88ff2777e8b0a0c8a22e0
Author: Martijn Versteegh
Date: Sat Dec 31 13:13:07 2022 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rBfee6059785e95179e5a88ff2777e8b0a0c8a22e0
Cleanup: make format
===================================================================
M source/blender/blenkernel/intern/customdata.cc
M source/blender/blenloader/intern/versioning_280.c
M source/blender/editors/mesh/mesh_data.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/customdata.cc
b/source/blender/blenkernel/intern/customdata.cc
index fd623dd6d22..0509592427a 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -4414,9 +4414,9 @@ static bool
CustomData_layer_ensure_data_exists(CustomDataLayer *layer, size_t c
switch (layer->type) {
/* When more instances of corrupt files are found, add them here. */
- case CD_PROP_BOOL: /* See T84935. */
- case CD_MLOOPUV: /* See T90620. */
- case CD_PROP_FLOAT2: /* See T90620. */
+ case CD_PROP_BOOL: /* See T84935. */
+ case CD_MLOOPUV: /* See T90620. */
+ case CD_PROP_FLOAT2: /* See T90620. */
layer->data = MEM_calloc_arrayN(count, typeInfo->size,
layerType_getName(layer->type));
BLI_assert(layer->data);
if (typeInfo->set_default_value) {
diff --git a/source/blender/blenloader/intern/versioning_280.c
b/source/blender/blenloader/intern/versioning_280.c
index c12f03ce399..a41adc72a4f 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1798,7 +1798,8 @@ void blo_do_versions_280(FileData *fd, Library
*UNUSED(lib), Main *bmain)
if (DNA_struct_find(fd->filesdna, "MTexPoly")) {
for (Mesh *me = bmain->meshes.first; me; me = me->id.next) {
/* If we have UV's, so this file will have MTexPoly layers too! */
- if (CustomData_has_layer(&me->ldata, CD_MLOOPUV) ||
CustomData_has_layer(&me->ldata, CD_PROP_FLOAT2)) {
+ if (CustomData_has_layer(&me->ldata, CD_MLOOPUV) ||
+ CustomData_has_layer(&me->ldata, CD_PROP_FLOAT2)) {
CustomData_update_typemap(&me->pdata);
CustomData_free_layers(&me->pdata, CD_MTEXPOLY, me->totpoly);
}
diff --git a/source/blender/editors/mesh/mesh_data.cc
b/source/blender/editors/mesh/mesh_data.cc
index d14a69d3c23..86d64355b63 100644
--- a/source/blender/editors/mesh/mesh_data.cc
+++ b/source/blender/editors/mesh/mesh_data.cc
@@ -140,7 +140,6 @@ static void delete_customdata_layer(Mesh *me,
CustomDataLayer *layer)
}
}
-
static void mesh_uv_reset_array(float **fuv, const int len)
{
if (len == 3) {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
