[Bf-blender-cvs] [20789413913] refactor-mesh-uv-map-generic: Change MAX_CUSTOMDATA_LAYER_NAME to 72 characters.
Martijn Versteegh
noreply at git.blender.org
Tue Oct 11 14:08:43 CEST 2022
Commit: 20789413913d24ce7f1dcbb0168c3e0be30a3f8a
Author: Martijn Versteegh
Date: Tue Oct 11 14:03:15 2022 +0200
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB20789413913d24ce7f1dcbb0168c3e0be30a3f8a
Change MAX_CUSTOMDATA_LAYER_NAME to 72 characters.
We need four extra characters compared to the maximum name length the
user is allowed to provide, to store the prefixes for associated
layers. Changing MAX_CUSTOMDATA_LAYER_NAME to 68 leads to lots of dna
alignment errors which need padding. So instead of padding we just
increase the length to 72.
===================================================================
M source/blender/blenkernel/BKE_editmesh_tangent.h
M source/blender/blenkernel/BKE_mesh_tangent.h
M source/blender/blenkernel/intern/editmesh_tangent.cc
M source/blender/blenkernel/intern/mesh_tangent.cc
M source/blender/gpu/GPU_material.h
M source/blender/gpu/intern/gpu_vertex_format.cc
M source/blender/makesdna/DNA_customdata_types.h
M source/blender/makesdna/DNA_dynamicpaint_types.h
M source/blender/makesdna/DNA_fluid_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_particle_types.h
M source/blender/makesdna/DNA_texture_types.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_editmesh_tangent.h b/source/blender/blenkernel/BKE_editmesh_tangent.h
index ee1fda2e5db..fe4da0e94ab 100644
--- a/source/blender/blenkernel/BKE_editmesh_tangent.h
+++ b/source/blender/blenkernel/BKE_editmesh_tangent.h
@@ -19,7 +19,7 @@ extern "C" {
*/
void BKE_editmesh_loop_tangent_calc(BMEditMesh *em,
bool calc_active_tangent,
- const char (*tangent_names)[MAX_NAME],
+ const char (*tangent_names)[72 /* MAX_CUSTOMDATA_LAYER_NAME*/],
int tangent_names_len,
const float (*poly_normals)[3],
const float (*loop_normals)[3],
diff --git a/source/blender/blenkernel/BKE_mesh_tangent.h b/source/blender/blenkernel/BKE_mesh_tangent.h
index 54089fa67e8..41f5e81374d 100644
--- a/source/blender/blenkernel/BKE_mesh_tangent.h
+++ b/source/blender/blenkernel/BKE_mesh_tangent.h
@@ -50,7 +50,7 @@ void BKE_mesh_calc_loop_tangent_ex(const struct MVert *mvert,
struct CustomData *loopdata,
bool calc_active_tangent,
- const char (*tangent_names)[64],
+ const char (*tangent_names)[72 /*MAX_CUSTOMDATA_LAYER_NAME */],
int tangent_names_len,
const float (*vert_normals)[3],
const float (*poly_normals)[3],
@@ -63,7 +63,7 @@ void BKE_mesh_calc_loop_tangent_ex(const struct MVert *mvert,
void BKE_mesh_calc_loop_tangents(struct Mesh *me_eval,
bool calc_active_tangent,
- const char (*tangent_names)[MAX_NAME],
+ const char (*tangent_names)[MAX_CUSTOMDATA_LAYER_NAME],
int tangent_names_len);
/* Helpers */
@@ -81,7 +81,7 @@ void BKE_mesh_add_loop_tangent_named_layer_for_uv(struct CustomData *uv_data,
*/
void BKE_mesh_calc_loop_tangent_step_0(const struct CustomData *loopData,
bool calc_active_tangent,
- const char (*tangent_names)[64],
+ const char (*tangent_names)[72 /* MAX_CUSTOMDATA_LAYER_NAME */],
int tangent_names_count,
bool *rcalc_act,
bool *rcalc_ren,
diff --git a/source/blender/blenkernel/intern/editmesh_tangent.cc b/source/blender/blenkernel/intern/editmesh_tangent.cc
index cfb8b709050..9f7fb3b4d77 100644
--- a/source/blender/blenkernel/intern/editmesh_tangent.cc
+++ b/source/blender/blenkernel/intern/editmesh_tangent.cc
@@ -157,7 +157,7 @@ static void emDM_calc_loop_tangents_thread(TaskPool *__restrict UNUSED(pool), vo
void BKE_editmesh_loop_tangent_calc(BMEditMesh *em,
bool calc_active_tangent,
- const char (*tangent_names)[MAX_NAME],
+ const char (*tangent_names)[MAX_CUSTOMDATA_LAYER_NAME],
int tangent_names_len,
const float (*poly_normals)[3],
const float (*loop_normals)[3],
diff --git a/source/blender/blenkernel/intern/mesh_tangent.cc b/source/blender/blenkernel/intern/mesh_tangent.cc
index 783438c5667..ece353c62b0 100644
--- a/source/blender/blenkernel/intern/mesh_tangent.cc
+++ b/source/blender/blenkernel/intern/mesh_tangent.cc
@@ -323,7 +323,7 @@ void BKE_mesh_add_loop_tangent_named_layer_for_uv(CustomData *uv_data,
void BKE_mesh_calc_loop_tangent_step_0(const CustomData *loopData,
bool calc_active_tangent,
- const char (*tangent_names)[MAX_NAME],
+ const char (*tangent_names)[MAX_CUSTOMDATA_LAYER_NAME],
int tangent_names_count,
bool *rcalc_act,
bool *rcalc_ren,
@@ -403,7 +403,7 @@ void BKE_mesh_calc_loop_tangent_ex(const MVert *mvert,
CustomData *loopdata,
bool calc_active_tangent,
- const char (*tangent_names)[MAX_NAME],
+ const char (*tangent_names)[MAX_CUSTOMDATA_LAYER_NAME],
int tangent_names_len,
const float (*vert_normals)[3],
const float (*poly_normals)[3],
@@ -418,8 +418,8 @@ void BKE_mesh_calc_loop_tangent_ex(const MVert *mvert,
int ren_uv_n = -1;
bool calc_act = false;
bool calc_ren = false;
- char act_uv_name[MAX_NAME];
- char ren_uv_name[MAX_NAME];
+ char act_uv_name[MAX_CUSTOMDATA_LAYER_NAME];
+ char ren_uv_name[MAX_CUSTOMDATA_LAYER_NAME];
short tangent_mask = 0;
short tangent_mask_curr = *tangent_mask_curr_p;
@@ -576,7 +576,7 @@ void BKE_mesh_calc_loop_tangent_ex(const MVert *mvert,
void BKE_mesh_calc_loop_tangents(Mesh *me_eval,
bool calc_active_tangent,
- const char (*tangent_names)[MAX_NAME],
+ const char (*tangent_names)[MAX_CUSTOMDATA_LAYER_NAME],
int tangent_names_len)
{
BKE_mesh_runtime_looptri_ensure(me_eval);
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h
index 1c9bdc77bac..d1bd93711e1 100644
--- a/source/blender/gpu/GPU_material.h
+++ b/source/blender/gpu/GPU_material.h
@@ -300,7 +300,7 @@ void GPU_pass_cache_free(void);
typedef struct GPUMaterialAttribute {
struct GPUMaterialAttribute *next, *prev;
int type; /* eCustomDataType */
- char name[64]; /* MAX_CUSTOMDATA_LAYER_NAME */
+ char name[72]; /* MAX_CUSTOMDATA_LAYER_NAME */
char input_name[12 + 1]; /* GPU_MAX_SAFE_ATTR_NAME + 1 */
eGPUType gputype;
eGPUDefaultValue default_value; /* Only for volumes attributes. */
@@ -334,10 +334,10 @@ typedef struct GPUUniformAttr {
struct GPUUniformAttr *next, *prev;
/* Meaningful part of the attribute set key. */
- char name[64]; /* MAX_CUSTOMDATA_LAYER_NAME */
+ char name[72]; /* MAX_CUSTOMDATA_LAYER_NAME */
/** Escaped name with [""]. */
- char name_id_prop[64 * 2 + 4];
- /** Hash of name[64] + use_dupli. */
+ char name_id_prop[72 * 2 + 4];
+ /** Hash of name[72] + use_dupli. */
uint32_t hash_code;
bool use_dupli;
diff --git a/source/blender/gpu/intern/gpu_vertex_format.cc b/source/blender/gpu/intern/gpu_vertex_format.cc
index 897e80293bf..f1cfa52d28c 100644
--- a/source/blender/gpu/intern/gpu_vertex_format.cc
+++ b/source/blender/gpu/intern/gpu_vertex_format.cc
@@ -199,7 +199,7 @@ void GPU_vertformat_multiload_enable(GPUVertFormat *format, int load_count)
for (int i = 0; i < attr_len; i++, attr++) {
const char *attr_name = GPU_vertformat_attr_name_get(format, attr, 0);
for (int j = 1; j < load_count; j++) {
- char load_name[64];
+ char load_name[72];
BLI_snprintf(load_name, sizeof(load_name), "%s%d", attr_name, j);
GPUVertAttr *dst_attr = &format->attrs[format->attr_len++];
*dst_attr = *attr;
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index 287a9e2f3b9..d9de9893456 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -36,7 +36,7 @@ typedef struct CustomDataLayer {
/** Shape keyblock unique id reference. */
int uid;
/** Layer name, MAX_CUSTOMDATA_LAYER_NAME. */
- char name[64];
+ char name[72];
/** Layer data. */
void *data;
/**
@@ -48,7 +48,7 @@ typedef struct CustomDataLayer {
const struct AnonymousAttributeID *anonymous_id;
} CustomDataLayer;
-#define MAX_CUSTOMDATA_LAYER_NAME 64
+#define MAX_CUSTOMDATA_LAYER_NAME 72
typedef struct CustomDataExternal {
/** FILE_MAX. */
diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h
index eef3b59c20d..7cb6ff62dcc 100644
--- a/source/blender/makesdna/DNA_dynamicpaint_types.h
+++ b/source/blender/makesdna/DNA_dynamicpaint_types.h
@@ -113,7 +113,7 @@ typedef struct DynamicPaintSurface {
float init_color[4];
struct Tex *init_texture;
/** MAX_CUSTOMDATA_LAYER_NAME. */
- char init_layername[64];
+ char init_layername[72];
int dry_speed, diss_speed;
float color_dry_threshold;
@@ -130,13 +130,13 @@ typedef struct DynamicPaintSurface {
char _pad2[4];
/** MAX_CUSTOMDATA_LAYER_NAME. */
- char uvlayer_name[64];
+ char uvlayer_name[72];
/** 1024 = FILE_MAX. */
char image_output_path[1024];
/** MAX_CUSTOMDATA_LAYER_NAME. */
- char output_name[64];
+ char output_name[72];
/** MAX_CUSTOMDATA_LAYER_NAME */ /* some surfaces have 2 outputs. */
- char output_name2[64];
+ char output_name2[72];
} DynamicPaintSurface;
diff --git a/source/blender/makesdna/DNA_fluid_types.h b/source/blender/makesdna/DNA_fluid_types.h
index 5a1636879bb..d0bce127c55 100644
--- a/source/blender/makesdna/DNA_fluid_types.h
+++ b/source/blender/makesdna/DNA_fluid_types.h
@@ -784,7 +784,7 @@ typedef struct FluidFlowSettings {
float texture_offset;
char _pad2[4];
/* MAX_CUSTOMDATA_LAYER_NAME. */
- char uvlayer_name[64];
+ char uvlayer_name[72];
short vgroup_density;
short type; /* Smoke, flames, both, outflow, liquid. */
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 7625f04fefa..b9f2659ff01 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -143,7 +143,7 @@ typedef struct MappingInfoModifierData {
struct Object *map_object;
char map_bone[64];
/** MAX_CUST
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list