blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 745 Projects 19 Wiki Activity

Fix #106430: Index the right UVmap in BMesh #106537

Closed
Martijn Versteegh wants to merge 5 commits from Baardaap:fix-named-uvmap_bmesh into main
pull from: Baardaap:fix-named-uvmap_bmesh
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 5 Files Changed 5 +6 -7
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 85cfb3df77 - Show all commits

10
source/blender/bmesh/intern/bmesh_query_uv.cc
View File

@ -20,14 +20,13 @@
#include "bmesh.h"
#include "intern/bmesh_private.h"
BMUVOffsets BM_uv_map_get_offsets_n(const BMesh *bm, int layer)
Hans Goudey commented 2023-04-04 16:42:25 +02:00
Review
Copy Link

int layer -> const int layer

`int layer` -> `const int layer`
{
using namespace blender;
using namespace blender::bke;
const int layer_index = layer == -1 ? CustomData_get_active_layer_index(&bm->ldata, CD_PROP_FLOAT2) :
CustomData_get_layer_index_n(&bm->ldata, CD_PROP_FLOAT2, layer);
const int layer_index = layer == -1 ?
HooglyBoogly marked this conversation as resolved Outdated
Hans Goudey commented 2023-04-04 13:46:57 +02:00
Outdated
Review
Copy Link

It might be simper/clearer if BM_uv_map_get_offsets called CustomData_get_active_layer_index directly. Then BM_uv_map_get_offsets_n wouldn't have to have a special case for -1.

It might be simper/clearer if `BM_uv_map_get_offsets` called `CustomData_get_active_layer_index` directly. Then `BM_uv_map_get_offsets_n` wouldn't have to have a special case for -1.
CustomData_get_active_layer_index(&bm->ldata, CD_PROP_FLOAT2) :
CustomData_get_layer_index_n(&bm->ldata, CD_PROP_FLOAT2, layer);
if (layer_index == -1) {
return {-1, -1, -1, -1};
}
@ -49,10 +48,9 @@ BMUVOffsets BM_uv_map_get_offsets_n(const BMesh *bm, int layer)
BMUVOffsets BM_uv_map_get_offsets(const BMesh *bm)
HooglyBoogly marked this conversation as resolved Outdated
Hans Goudey commented 2023-04-04 14:22:49 +02:00
Outdated
Review
Copy Link

Missing clang format here (line is 101 characters long)

Missing clang format here (line is 101 characters long)
{
return BM_uv_map_get_offsets_n(bm, -1);
return BM_uv_map_get_offsets_n(bm, -1);
}
static void uv_aspect(const BMLoop *l,
const float aspect[2],
const int cd_loop_uv_offset,

3
source/blender/bmesh/intern/bmesh_query_uv.h
View File

@ -11,7 +11,8 @@ extern "C" {
#endif
/**
* Retrieve the custom data offsets for layers used for user interaction with a UV map, returns the active uv map if layer is -1.
* Retrieve the custom data offsets for layers used for user interaction with a UV map, returns the
* active uv map if layer is -1.
*/
BMUVOffsets BM_uv_map_get_offsets(const BMesh *bm);
BMUVOffsets BM_uv_map_get_offsets_n(const BMesh *bm, int layer);