[Bf-blender-cvs] [9e5e2aa775a] master: Cleanup: rename Mesh/Curve/MetaBall loc/size/texflag
Campbell Barton
noreply at git.blender.org
Wed Jan 18 07:30:00 CET 2023
Commit: 9e5e2aa775a9d7082ee2a1da8468cd5f46760caa
Author: Campbell Barton
Date: Wed Jan 18 17:17:32 2023 +1100
Branches: master
https://developer.blender.org/rB9e5e2aa775a9d7082ee2a1da8468cd5f46760caa
Cleanup: rename Mesh/Curve/MetaBall loc/size/texflag
Struct members loc/size were misleading as they read as if the object
data stored object level transform channels. Rename these to match RNA
with a `texspace_*` prefix to make it clear these struct members only
apply to texture-space transform.
Also rename ME_AUTOSPACE & ME_AUTOSPACE_EVALUATED to
ME_TEXSPACE_FLAG_AUTO & ME_TEXSPACE_FLAG_AUTO_EVALUATED.
===================================================================
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/intern/curve.cc
M source/blender/blenkernel/intern/mesh.cc
M source/blender/blenkernel/intern/mesh_convert.cc
M source/blender/blenkernel/intern/object.cc
M source/blender/blenkernel/intern/particle.cc
M source/blender/draw/engines/overlay/overlay_extra.cc
M source/blender/draw/intern/draw_manager_data.cc
M source/blender/draw/intern/draw_resource.hh
M source/blender/editors/curve/editcurve.c
M source/blender/editors/transform/transform_convert_object_texspace.c
M source/blender/makesdna/DNA_curve_defaults.h
M source/blender/makesdna/DNA_curve_types.h
M source/blender/makesdna/DNA_mesh_defaults.h
M source/blender/makesdna/DNA_mesh_types.h
M source/blender/makesdna/DNA_meta_defaults.h
M source/blender/makesdna/DNA_meta_types.h
M source/blender/makesdna/intern/dna_rename_defs.h
M source/blender/makesrna/intern/rna_curve.c
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_meta.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index ad964184263..dc595ff0ce1 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -247,11 +247,13 @@ struct BoundBox *BKE_mesh_boundbox_get(struct Object *ob);
void BKE_mesh_texspace_calc(struct Mesh *me);
void BKE_mesh_texspace_ensure(struct Mesh *me);
-void BKE_mesh_texspace_get(struct Mesh *me, float r_loc[3], float r_size[3]);
+void BKE_mesh_texspace_get(struct Mesh *me,
+ float r_texspace_location[3],
+ float r_texspace_size[3]);
void BKE_mesh_texspace_get_reference(struct Mesh *me,
- char **r_texflag,
- float **r_loc,
- float **r_size);
+ char **r_texspace_flag,
+ float **r_texspace_location,
+ float **r_texspace_size);
void BKE_mesh_texspace_copy_from_object(struct Mesh *me, struct Object *ob);
/**
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index cfad8c5cfdb..963b0b87118 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -507,9 +507,9 @@ void BKE_object_handle_update_ex(struct Depsgraph *depsgraph,
void BKE_object_sculpt_data_create(struct Object *ob);
bool BKE_object_obdata_texspace_get(struct Object *ob,
- char **r_texflag,
- float **r_loc,
- float **r_size);
+ char **r_texspace_flag,
+ float **r_texspace_location,
+ float **r_texspace_size);
struct Mesh *BKE_object_get_evaluated_mesh_no_subsurf(const struct Object *object);
/** Get evaluated mesh for given object. */
diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc
index be6c7502891..1ac0e27a4a3 100644
--- a/source/blender/blenkernel/intern/curve.cc
+++ b/source/blender/blenkernel/intern/curve.cc
@@ -258,7 +258,7 @@ static void curve_blend_read_data(BlendDataReader *reader, ID *id)
switch_endian_knots(nu);
}
}
- cu->texflag &= ~CU_AUTOSPACE_EVALUATED;
+ cu->texspace_flag &= ~CU_TEXSPACE_FLAG_AUTO_EVALUATED;
BLO_read_data_address(reader, &cu->bevel_profile);
if (cu->bevel_profile != nullptr) {
@@ -517,7 +517,7 @@ BoundBox *BKE_curve_boundbox_get(Object *ob)
void BKE_curve_texspace_calc(Curve *cu)
{
- if (cu->texflag & CU_AUTOSPACE) {
+ if (cu->texspace_flag & CU_TEXSPACE_FLAG_AUTO) {
float min[3], max[3];
INIT_MINMAX(min, max);
@@ -526,35 +526,36 @@ void BKE_curve_texspace_calc(Curve *cu)
max[0] = max[1] = max[2] = 1.0f;
}
- float loc[3], size[3];
- mid_v3_v3v3(loc, min, max);
+ float texspace_location[3], texspace_size[3];
+ mid_v3_v3v3(texspace_location, min, max);
- size[0] = (max[0] - min[0]) / 2.0f;
- size[1] = (max[1] - min[1]) / 2.0f;
- size[2] = (max[2] - min[2]) / 2.0f;
+ texspace_size[0] = (max[0] - min[0]) / 2.0f;
+ texspace_size[1] = (max[1] - min[1]) / 2.0f;
+ texspace_size[2] = (max[2] - min[2]) / 2.0f;
for (int a = 0; a < 3; a++) {
- if (size[a] == 0.0f) {
- size[a] = 1.0f;
+ if (texspace_size[a] == 0.0f) {
+ texspace_size[a] = 1.0f;
}
- else if (size[a] > 0.0f && size[a] < 0.00001f) {
- size[a] = 0.00001f;
+ else if (texspace_size[a] > 0.0f && texspace_size[a] < 0.00001f) {
+ texspace_size[a] = 0.00001f;
}
- else if (size[a] < 0.0f && size[a] > -0.00001f) {
- size[a] = -0.00001f;
+ else if (texspace_size[a] < 0.0f && texspace_size[a] > -0.00001f) {
+ texspace_size[a] = -0.00001f;
}
}
- copy_v3_v3(cu->loc, loc);
- copy_v3_v3(cu->size, size);
+ copy_v3_v3(cu->texspace_location, texspace_location);
+ copy_v3_v3(cu->texspace_size, texspace_size);
- cu->texflag |= CU_AUTOSPACE_EVALUATED;
+ cu->texspace_flag |= CU_TEXSPACE_FLAG_AUTO_EVALUATED;
}
}
void BKE_curve_texspace_ensure(Curve *cu)
{
- if ((cu->texflag & CU_AUTOSPACE) && !(cu->texflag & CU_AUTOSPACE_EVALUATED)) {
+ if ((cu->texspace_flag & CU_TEXSPACE_FLAG_AUTO) &&
+ (cu->texspace_flag & CU_TEXSPACE_FLAG_AUTO_EVALUATED) == 0) {
BKE_curve_texspace_calc(cu);
}
}
@@ -5508,10 +5509,10 @@ void BKE_curve_eval_geometry(Depsgraph *depsgraph, Curve *curve)
BKE_curve_texspace_calc(curve);
if (DEG_is_active(depsgraph)) {
Curve *curve_orig = (Curve *)DEG_get_original_id(&curve->id);
- if (curve->texflag & CU_AUTOSPACE_EVALUATED) {
- curve_orig->texflag |= CU_AUTOSPACE_EVALUATED;
- copy_v3_v3(curve_orig->loc, curve->loc);
- copy_v3_v3(curve_orig->size, curve->size);
+ if (curve->texspace_flag & CU_TEXSPACE_FLAG_AUTO_EVALUATED) {
+ curve_orig->texspace_flag |= CU_TEXSPACE_FLAG_AUTO_EVALUATED;
+ copy_v3_v3(curve_orig->texspace_location, curve->texspace_location);
+ copy_v3_v3(curve_orig->texspace_size, curve->texspace_size);
}
}
}
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index 8ee01107c84..71275444028 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -360,7 +360,7 @@ static void mesh_blend_read_data(BlendDataReader *reader, ID *id)
BLO_read_data_address(reader, &mesh->active_color_attribute);
BLO_read_data_address(reader, &mesh->default_color_attribute);
- mesh->texflag &= ~ME_AUTOSPACE_EVALUATED;
+ mesh->texspace_flag &= ~ME_TEXSPACE_FLAG_AUTO_EVALUATED;
mesh->edit_mesh = nullptr;
mesh->runtime = new blender::bke::MeshRuntime();
@@ -1029,9 +1029,9 @@ void BKE_mesh_copy_parameters(Mesh *me_dst, const Mesh *me_src)
me_dst->face_sets_color_default = me_src->face_sets_color_default;
/* Copy texture space. */
- me_dst->texflag = me_src->texflag;
- copy_v3_v3(me_dst->loc, me_src->loc);
- copy_v3_v3(me_dst->size, me_src->size);
+ me_dst->texspace_flag = me_src->texspace_flag;
+ copy_v3_v3(me_dst->texspace_location, me_src->texspace_location);
+ copy_v3_v3(me_dst->texspace_size, me_src->texspace_size);
me_dst->vertex_group_active_index = me_src->vertex_group_active_index;
me_dst->attributes_active_index = me_src->attributes_active_index;
@@ -1228,7 +1228,7 @@ BoundBox *BKE_mesh_boundbox_get(Object *ob)
void BKE_mesh_texspace_calc(Mesh *me)
{
- if (me->texflag & ME_AUTOSPACE) {
+ if (me->texspace_flag & ME_TEXSPACE_FLAG_AUTO) {
float min[3], max[3];
INIT_MINMAX(min, max);
@@ -1237,75 +1237,79 @@ void BKE_mesh_texspace_calc(Mesh *me)
max[0] = max[1] = max[2] = 1.0f;
}
- float loc[3], size[3];
- mid_v3_v3v3(loc, min, max);
+ float texspace_location[3], texspace_size[3];
+ mid_v3_v3v3(texspace_location, min, max);
- size[0] = (max[0] - min[0]) / 2.0f;
- size[1] = (max[1] - min[1]) / 2.0f;
- size[2] = (max[2] - min[2]) / 2.0f;
+ texspace_size[0] = (max[0] - min[0]) / 2.0f;
+ texspace_size[1] = (max[1] - min[1]) / 2.0f;
+ texspace_size[2] = (max[2] - min[2]) / 2.0f;
for (int a = 0; a < 3; a++) {
- if (size[a] == 0.0f) {
- size[a] = 1.0f;
+ if (texspace_size[a] == 0.0f) {
+ texspace_size[a] = 1.0f;
}
- else if (size[a] > 0.0f && size[a] < 0.00001f) {
- size[a] = 0.00001f;
+ else if (texspace_size[a] > 0.0f && texspace_size[a] < 0.00001f) {
+ texspace_size[a] = 0.00001f;
}
- else if (size[a] < 0.0f && size[a] > -0.00001f) {
- size[a] = -0.00001f;
+ else if (texspace_size[a] < 0.0f && texspace_size[a] > -0.00001f) {
+ texspace_size[a] = -0.00001f;
}
}
- copy_v3_v3(me->loc, loc);
- copy_v3_v3(me->size, size);
+ copy_v3_v3(me->texspace_location, texspace_location);
+ copy_v3_v3(me->texspace_size, texspace_size);
- me->texflag |= ME_AUTOSPACE_EVALUATED;
+ me->texspace_flag |= ME_TEXSPACE_FLAG_AUTO_EVALUATED;
}
}
void BKE_mesh_texspace_ensure(Mesh *me)
{
- if ((me->texflag & ME_AUTOSPACE) && !(me->texflag & ME_AUTOSPACE_EVALUATED)) {
+ if ((me->texspace_flag & ME_TEXSPACE_FLAG_AUTO) &&
+ !(me->texspace_flag & ME_TEXSPACE_FLAG_AUTO_EVALUATED)) {
BKE_mesh_texspace_calc(me);
}
}
-void BKE_mesh_texspace_get(Mesh *me, float r_loc[3], float r_size[3])
+void BKE_mesh_texspace_get(Mesh *me, float r_texspace_location[3], float r_texspace_size[3])
{
BKE_mesh_texspace_ensure(me);
- if (r_loc) {
- copy_v3_v3(r_loc, me->loc);
+ if (r_texspace_location) {
+ copy_v3_v3(r_texspace_location, me->texspace_location);
}
- if (r_size) {
- copy_v3_v3(r_size, me->size);
+ if (r_texspace_size) {
+ copy_v3_v3(r_texspace_size, me->texspace_size);
}
}
-void BKE_mesh_texspace_get_reference(Mesh *me, char **r_texflag, float **r_loc, float **r_size)
+void BKE_mesh_texspace_get_reference(Mesh *me,
+ char **r_texspace_flag,
+ float **r_texspace_location,
+ float **r_texspace_size)
{
BKE_mesh_texspace_ensure(me);
- if (r_texflag != nullptr) {
- *r_texflag = &me->texflag;
+ if (r_texspace_flag != nullptr) {
+ *r_texspace_flag = &me->texspace_flag;
}
- if (r_loc != nullptr) {
- *r_loc = me->loc;
+ if (r_texspace_location != nullptr) {
+ *r_texspace_location = me->texspace_location;
}
- if (r_size != nullptr) {
- *r_size = me->size;
+ if (r_texspace_size != nullptr) {
+ *r_texspace_size = me->texspace_size;
}
}
void BKE_mesh_texspace_copy_from_object(Mesh *me, Object *ob)
{
- float *texloc, *texsize;
- char *texflag;
+ float *texspace_location, *texspace_size;
+ char *texspace_flag;
- if (BKE_object_obdata_texspace_get(ob, &texflag, &texloc, &texsize)) {
- me->texflag = *texflag;
- copy_v3_v3(me->loc, texloc);
- copy_v3_v3(me->size, texsize);
+ if (BKE_object_obdata_texspace_get(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list