blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Fix: Use ShaderCreateInfo for Cycles fallback display. #104981

Closed
Jason Fielder wants to merge 89 commits from Jason-Fielder:CyclesFallbackDisplayShader_CreateInfo into blender-v3.5-release
pull from: Jason-Fielder:CyclesFallbackDisplayShader_CreateInfo
merge into: blender:blender-v3.5-release

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 89 Files Changed 115 +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 ab63fe9eab - 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;
}
int CustomData_number_of_layers_typemask(const CustomData *data, const eCustomDataMask mask)
{
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 */
/* Define the accessors for a basic CustomDataLayer collection, skipping anonymous layers */
#define DEFINE_CUSTOMDATA_LAYER_COLLECTION(collection_name, customdata_type, layer_type) \
/* check */ \
@ -38,7 +37,9 @@
static int rna_Mesh_##collection_name##s_length(PointerRNA *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 */ \
static void rna_Mesh_##collection_name##_index_range( \
@ -46,11 +47,12 @@
{ \
CustomData *data = rna_mesh_##customdata_type(ptr); \
*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); \
}
/* Define the accessors for special CustomDataLayers in the collection
* (active, render, clone, stencil, etc) */
#define DEFINE_CUSTOMDATA_LAYER_COLLECTION_ACTIVEITEM( \