Merge branch 'blender-v4.2-release'
This commit is contained in:
commit
428c525a41
@ -316,7 +316,7 @@ class GLShaderCompiler : public ShaderCompiler {
|
||||
SpecializationBatch current_specialization_batch;
|
||||
void prepare_next_specialization_batch();
|
||||
|
||||
/* Shared accross regular and specialization batches,
|
||||
/* Shared across regular and specialization batches,
|
||||
* to prevent the use of a wrong handle type. */
|
||||
int64_t next_batch_handle = 1;
|
||||
|
||||
|
@ -531,7 +531,7 @@ static bool init_structDNA(SDNA *sdna, bool do_endian_swap, const char **r_error
|
||||
}
|
||||
{
|
||||
uint dummy_index = 0;
|
||||
/* TODO: This should be generalized at some point. We should be able to specify overaligned
|
||||
/* TODO: This should be generalized at some point. We should be able to specify `overaligned`
|
||||
* types directly in the DNA struct definitions. */
|
||||
sdna->types_alignment[DNA_struct_find_without_alias_ex(sdna, "mat4x4f", &dummy_index)] =
|
||||
alignof(blender::float4x4);
|
||||
|
@ -390,6 +390,7 @@ dict_custom = {
|
||||
"symmetrize",
|
||||
"symmetrized",
|
||||
"targetless",
|
||||
"tedrahedral",
|
||||
"teleporting",
|
||||
"templating",
|
||||
"tertiarily",
|
||||
|
Loading…
Reference in New Issue
Block a user