griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix (unreported) wrong alignement handling for mat4x4f DNA struct.

Browse Source 
Code was using the `struct_index` instead of the `type_index` to set the
alignement value for this struct, effectively setting that alignement
value for another struct/type than `mat4fx4f`.

Found while working on naming cleanups of maksdna code.

Pull Request: https://projects.blender.org/blender/blender/pulls/125777
This commit is contained in:
Bastien Montagne
2024-08-01 16:38:16 +02:00
committed by Gitea
parent c90f13f2b3
commit 5ce7937101
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/makesdna/intern/dna_genfile.cc
View File

@@ -549,14 +549,10 @@ static bool init_structDNA(SDNA *sdna, bool do_endian_swap, const char **r_error
uint dummy_index = 0;
const int mat4x4f_struct_index = DNA_struct_find_index_without_alias_ex(
sdna, "mat4x4f", &dummy_index);
if (mat4x4f_struct_index >= 0) {
#if 0 /* FIXME: This is using the wrong index. Code should be: */
if (mat4x4f_struct_index > 0) {
SDNA_Struct *struct_info = sdna->structs[mat4x4f_struct_index];
const int mat4x4f_type_index = struct_info->type_index;
sdna->types_alignment[mat4x4f_type_index] = alignof(blender::float4x4);
#else
sdna->types_alignment[mat4x4f_struct_index] = alignof(blender::float4x4);
#endif
}
}