Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

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

1
source/blender/blenkernel/intern/customdata.cc
View File

@ -3004,7 +3004,6 @@ int CustomData_number_of_anonymous_layers(const CustomData *data, const int type
return number; return number;
} }
int CustomData_number_of_layers_typemask(const CustomData *data, const eCustomDataMask mask) int CustomData_number_of_layers_typemask(const CustomData *data, const eCustomDataMask mask)
{ {
int number = 0; int number = 0;

10
source/blender/makesrna/intern/rna_mesh_utils.h
View File

@ -8,7 +8,6 @@
/* Macros to help reduce code clutter in rna_mesh.c */ /* Macros to help reduce code clutter in rna_mesh.c */
/* Define the accessors for a basic CustomDataLayer collection, skipping anonymous layers */ /* Define the accessors for a basic CustomDataLayer collection, skipping anonymous layers */
#define DEFINE_CUSTOMDATA_LAYER_COLLECTION(collection_name, customdata_type, layer_type) \ #define DEFINE_CUSTOMDATA_LAYER_COLLECTION(collection_name, customdata_type, layer_type) \
/* check */ \ /* check */ \
@ -38,7 +37,9 @@
static int rna_Mesh_##collection_name##s_length(PointerRNA *ptr) \ static int rna_Mesh_##collection_name##s_length(PointerRNA *ptr) \
{ \ { \
CustomData *data = rna_mesh_##customdata_type(ptr); \ CustomData *data = rna_mesh_##customdata_type(ptr); \
return data ? CustomData_number_of_layers(data, layer_type) - CustomData_number_of_anonymous_layers(data, layer_type) : 0; \ return data ? CustomData_number_of_layers(data, layer_type) - \
CustomData_number_of_anonymous_layers(data, layer_type) : \
0; \
} \ } \
/* index range */ \ /* index range */ \
static void rna_Mesh_##collection_name##_index_range( \ static void rna_Mesh_##collection_name##_index_range( \
@ -46,11 +47,12 @@
{ \ { \
CustomData *data = rna_mesh_##customdata_type(ptr); \ CustomData *data = rna_mesh_##customdata_type(ptr); \
*min = 0; \ *min = 0; \
*max = data ? CustomData_number_of_layers(data, layer_type) - CustomData_number_of_anonymous_layers(data, layer_type) - 1 : 0; \ *max = data ? CustomData_number_of_layers(data, layer_type) - \
CustomData_number_of_anonymous_layers(data, layer_type) - 1 : \
0; \
*max = MAX2(0, *max); \ *max = MAX2(0, *max); \
} }
/* Define the accessors for special CustomDataLayers in the collection /* Define the accessors for special CustomDataLayers in the collection
* (active, render, clone, stencil, etc) */ * (active, render, clone, stencil, etc) */
#define DEFINE_CUSTOMDATA_LAYER_COLLECTION_ACTIVEITEM( \ #define DEFINE_CUSTOMDATA_LAYER_COLLECTION_ACTIVEITEM( \