[Bf-blender-cvs] [ceecd6d0dce] refactor-mesh-uv-map-generic: Cleanup: make format
Baardaap
noreply at git.blender.org
Sun Dec 11 15:49:24 CET 2022
Commit: ceecd6d0dcee96ebc2fd23907299bd508c71420b
Author: Baardaap
Date: Sun Dec 11 13:01:09 2022 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rBceecd6d0dcee96ebc2fd23907299bd508c71420b
Cleanup: make format
===================================================================
M source/blender/blenkernel/intern/mesh_mirror.cc
M source/blender/draw/engines/overlay/overlay_edit_uv.cc
M source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
M source/blender/render/intern/bake.cc
M source/blender/render/intern/multires_bake.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh_mirror.cc b/source/blender/blenkernel/intern/mesh_mirror.cc
index f20acd8248e..248e3ed9190 100644
--- a/source/blender/blenkernel/intern/mesh_mirror.cc
+++ b/source/blender/blenkernel/intern/mesh_mirror.cc
@@ -356,7 +356,8 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd,
const int totuv = CustomData_number_of_layers(&result->ldata, CD_PROP_FLOAT2);
for (a = 0; a < totuv; a++) {
- float(*dmloopuv)[2] = static_cast<float (*)[2]>(CustomData_get_layer_n(&result->ldata, CD_PROP_FLOAT2, a));
+ float(*dmloopuv)[2] = static_cast<float(*)[2]>(
+ CustomData_get_layer_n(&result->ldata, CD_PROP_FLOAT2, a));
int j = maxLoops;
dmloopuv += j; /* second set of loops only */
for (; j-- > 0; dmloopuv++) {
diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.cc b/source/blender/draw/engines/overlay/overlay_edit_uv.cc
index 40530226f93..fbe5e24112b 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_uv.cc
+++ b/source/blender/draw/engines/overlay/overlay_edit_uv.cc
@@ -117,10 +117,10 @@ void OVERLAY_edit_uv_init(OVERLAY_Data *vedata)
const bool show_modified_uvs = sima->flag & SI_DRAWSHADOW;
const bool is_tiled_image = image && (image->source == IMA_SRC_TILED);
const bool do_edges_only = (ts->uv_flag & UV_SYNC_SELECTION) ?
- /* NOTE: Ignore #SCE_SELECT_EDGE because a single selected edge
- * on the mesh may cause single UV vertices to be selected. */
- false :
- (ts->uv_selectmode == UV_SELECT_EDGE);
+ /* NOTE: Ignore #SCE_SELECT_EDGE because a single selected edge
+ * on the mesh may cause single UV vertices to be selected. */
+ false :
+ (ts->uv_selectmode == UV_SELECT_EDGE);
const bool do_faces = ((sima->flag & SI_NO_DRAWFACES) == 0);
const bool do_face_dots = (ts->uv_flag & UV_SYNC_SELECTION) ?
(ts->selectmode & SCE_SELECT_FACE) != 0 :
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
index 45fc252b378..8a4c694b756 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
@@ -292,7 +292,7 @@ void OBJMesh::store_uv_coords_and_indices()
tot_uv_vertices_ = 0;
return;
}
- const bke::AttributeAccessor attributes = export_mesh_->attributes();
+ const bke::AttributeAccessor attributes = export_mesh_->attributes();
const VArraySpan<float2> uv_map = attributes.lookup<float2>(active_uv_name, ATTR_DOMAIN_CORNER);
const float limit[2] = {STD_UV_CONNECT_LIMIT, STD_UV_CONNECT_LIMIT};
diff --git a/source/blender/render/intern/bake.cc b/source/blender/render/intern/bake.cc
index 7a59d69e510..5594092d73c 100644
--- a/source/blender/render/intern/bake.cc
+++ b/source/blender/render/intern/bake.cc
@@ -716,11 +716,11 @@ void RE_bake_pixels_populate(Mesh *me,
{
const float(*mloopuv)[2];
if ((uv_layer == NULL) || (uv_layer[0] == '\0')) {
- mloopuv = static_cast<float (*)[2]>(CustomData_get_layer(&me->ldata, CD_PROP_FLOAT2));
+ mloopuv = static_cast<float(*)[2]>(CustomData_get_layer(&me->ldata, CD_PROP_FLOAT2));
}
else {
int uv_id = CustomData_get_named_layer(&me->ldata, CD_PROP_FLOAT2, uv_layer);
- mloopuv = static_cast<float (*)[2]>(CustomData_get_layer_n(&me->ldata, CD_PROP_FLOAT2, uv_id));
+ mloopuv = static_cast<float(*)[2]>(CustomData_get_layer_n(&me->ldata, CD_PROP_FLOAT2, uv_id));
}
if (mloopuv == nullptr) {
diff --git a/source/blender/render/intern/multires_bake.cc b/source/blender/render/intern/multires_bake.cc
index 85911fb0e39..8490ed1acb6 100644
--- a/source/blender/render/intern/multires_bake.cc
+++ b/source/blender/render/intern/multires_bake.cc
@@ -475,7 +475,7 @@ static void do_multires_bake(MultiresBakeRender *bkr,
MVert *mvert = dm->getVertArray(dm);
MPoly *mpoly = dm->getPolyArray(dm);
MLoop *mloop = dm->getLoopArray(dm);
- float(*mloopuv)[2] = static_cast<float (*)[2]>(dm->getLoopDataArray(dm, CD_PROP_FLOAT2));
+ float(*mloopuv)[2] = static_cast<float(*)[2]>(dm->getLoopDataArray(dm, CD_PROP_FLOAT2));
float *pvtangent = nullptr;
ListBase threads;
@@ -838,7 +838,8 @@ static void apply_heights_callback(DerivedMesh *lores_dm,
const MLoopTri *lt = lores_dm->getLoopTriArray(lores_dm) + tri_index;
MLoop *mloop = lores_dm->getLoopArray(lores_dm);
MPoly *mpoly = lores_dm->getPolyArray(lores_dm) + lt->poly;
- float(*mloopuv)[2] = static_cast<float (*)[2]>(lores_dm->getLoopDataArray(lores_dm, CD_PROP_FLOAT2));
+ float(*mloopuv)[2] = static_cast<float(*)[2]>(
+ lores_dm->getLoopDataArray(lores_dm, CD_PROP_FLOAT2));
MHeightBakeData *height_data = (MHeightBakeData *)bake_data;
MultiresBakeThread *thread_data = (MultiresBakeThread *)thread_data_v;
float uv[2], *st0, *st1, *st2, *st3;
@@ -952,7 +953,8 @@ static void apply_tangmat_callback(DerivedMesh *lores_dm,
{
const MLoopTri *lt = lores_dm->getLoopTriArray(lores_dm) + tri_index;
MPoly *mpoly = lores_dm->getPolyArray(lores_dm) + lt->poly;
- float(*mloopuv)[2] = static_cast<float (*)[2]>(lores_dm->getLoopDataArray(lores_dm, CD_PROP_FLOAT2));
+ float(*mloopuv)[2] = static_cast<float(*)[2]>(
+ lores_dm->getLoopDataArray(lores_dm, CD_PROP_FLOAT2));
MNormalBakeData *normal_data = (MNormalBakeData *)bake_data;
float uv[2], *st0, *st1, *st2, *st3;
int pixel = ibuf->x * y + x;
More information about the Bf-blender-cvs
mailing list