From 69ad44d5b48aa0d2cf00ff6c37be01f7384afe3b Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 23 Sep 2019 15:54:21 +0200 Subject: Cleanup: remove unimplemented texture space rotation variables --- source/blender/blenkernel/BKE_curve.h | 2 +- source/blender/blenkernel/BKE_mesh.h | 8 +++++--- source/blender/blenkernel/BKE_object.h | 6 ++++-- source/blender/blenkernel/intern/curve.c | 7 +------ source/blender/blenkernel/intern/mesh.c | 20 +++++--------------- source/blender/blenkernel/intern/mesh_convert.c | 1 - source/blender/blenkernel/intern/object.c | 11 ++--------- 7 files changed, 18 insertions(+), 37 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h index 98712af82e9..630c5fa1856 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -89,7 +89,7 @@ struct BoundBox *BKE_curve_boundbox_get(struct Object *ob); void BKE_curve_texspace_calc(struct Curve *cu); void BKE_curve_texspace_ensure(struct Curve *cu); -void BKE_curve_texspace_get(struct Curve *cu, float r_loc[3], float r_rot[3], float r_size[3]); +void BKE_curve_texspace_get(struct Curve *cu, float r_loc[3], float r_size[3]); bool BKE_curve_minmax(struct Curve *cu, bool use_radius, float min[3], float max[3]); bool BKE_curve_center_median(struct Curve *cu, float cent[3]); diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index fe45530e01e..76e67065329 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -193,9 +193,11 @@ 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_rot[3], float r_size[3]); -void BKE_mesh_texspace_get_reference( - struct Mesh *me, short **r_texflag, float **r_loc, float **r_rot, float **r_size); +void BKE_mesh_texspace_get(struct Mesh *me, float r_loc[3], float r_size[3]); +void BKE_mesh_texspace_get_reference(struct Mesh *me, + short **r_texflag, + float **r_loc, + float **r_size); void BKE_mesh_texspace_copy_from_object(struct Mesh *me, struct Object *ob); void BKE_mesh_split_faces(struct Mesh *mesh, bool free_loop_normals); diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index dcd926e9e19..ffdcb9cd2c0 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -321,8 +321,10 @@ void BKE_object_handle_update_ex(struct Depsgraph *depsgraph, void BKE_object_sculpt_data_create(struct Object *ob); -int BKE_object_obdata_texspace_get( - struct Object *ob, short **r_texflag, float **r_loc, float **r_size, float **r_rot); +int BKE_object_obdata_texspace_get(struct Object *ob, + short **r_texflag, + float **r_loc, + float **r_size); struct Mesh *BKE_object_get_evaluated_mesh(const struct Depsgraph *depsgraph, struct Object *ob); struct Mesh *BKE_object_get_final_mesh(struct Object *object); diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index a9d98c726c9..d81d250a305 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -340,7 +340,6 @@ void BKE_curve_texspace_calc(Curve *cu) copy_v3_v3(cu->loc, loc); copy_v3_v3(cu->size, size); - zero_v3(cu->rot); cu->texflag |= CU_AUTOSPACE_EVALUATED; } @@ -353,16 +352,13 @@ void BKE_curve_texspace_ensure(Curve *cu) } } -void BKE_curve_texspace_get(Curve *cu, float r_loc[3], float r_rot[3], float r_size[3]) +void BKE_curve_texspace_get(Curve *cu, float r_loc[3], float r_size[3]) { BKE_curve_texspace_ensure(cu); if (r_loc) { copy_v3_v3(r_loc, cu->loc); } - if (r_rot) { - copy_v3_v3(r_rot, cu->rot); - } if (r_size) { copy_v3_v3(r_size, cu->size); } @@ -5481,7 +5477,6 @@ void BKE_curve_eval_geometry(Depsgraph *depsgraph, Curve *curve) curve_orig->texflag |= CU_AUTOSPACE_EVALUATED; copy_v3_v3(curve_orig->loc, curve->loc); copy_v3_v3(curve_orig->size, curve->size); - copy_v3_v3(curve_orig->rot, curve->rot); } } } diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index e451ca06cba..a98fc414f31 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -865,7 +865,6 @@ void BKE_mesh_texspace_calc(Mesh *me) copy_v3_v3(me->loc, loc); copy_v3_v3(me->size, size); - zero_v3(me->rot); me->texflag |= ME_AUTOSPACE_EVALUATED; } @@ -878,23 +877,19 @@ void BKE_mesh_texspace_ensure(Mesh *me) } } -void BKE_mesh_texspace_get(Mesh *me, float r_loc[3], float r_rot[3], float r_size[3]) +void BKE_mesh_texspace_get(Mesh *me, float r_loc[3], float r_size[3]) { BKE_mesh_texspace_ensure(me); if (r_loc) { copy_v3_v3(r_loc, me->loc); } - if (r_rot) { - copy_v3_v3(r_rot, me->rot); - } if (r_size) { copy_v3_v3(r_size, me->size); } } -void BKE_mesh_texspace_get_reference( - Mesh *me, short **r_texflag, float **r_loc, float **r_rot, float **r_size) +void BKE_mesh_texspace_get_reference(Mesh *me, short **r_texflag, float **r_loc, float **r_size) { BKE_mesh_texspace_ensure(me); @@ -904,9 +899,6 @@ void BKE_mesh_texspace_get_reference( if (r_loc != NULL) { *r_loc = me->loc; } - if (r_rot != NULL) { - *r_rot = me->rot; - } if (r_size != NULL) { *r_size = me->size; } @@ -914,14 +906,13 @@ void BKE_mesh_texspace_get_reference( void BKE_mesh_texspace_copy_from_object(Mesh *me, Object *ob) { - float *texloc, *texrot, *texsize; + float *texloc, *texsize; short *texflag; - if (BKE_object_obdata_texspace_get(ob, &texflag, &texloc, &texsize, &texrot)) { + 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); - copy_v3_v3(me->rot, texrot); } } @@ -950,7 +941,7 @@ void BKE_mesh_orco_verts_transform(Mesh *me, float (*orco)[3], int totvert, int float loc[3], size[3]; int a; - BKE_mesh_texspace_get(me->texcomesh ? me->texcomesh : me, loc, NULL, size); + BKE_mesh_texspace_get(me->texcomesh ? me->texcomesh : me, loc, size); if (invert) { for (a = 0; a < totvert; a++) { @@ -1942,7 +1933,6 @@ void BKE_mesh_eval_geometry(Depsgraph *depsgraph, Mesh *mesh) mesh_orig->texflag |= ME_AUTOSPACE_EVALUATED; copy_v3_v3(mesh_orig->loc, mesh->loc); copy_v3_v3(mesh_orig->size, mesh->size); - copy_v3_v3(mesh_orig->rot, mesh->rot); } } } diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index e1b1fddc730..2ade368284c 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -667,7 +667,6 @@ void BKE_mesh_from_nurbs_displist(Main *bmain, me->texflag = cu->texflag & ~CU_AUTOSPACE; copy_v3_v3(me->loc, cu->loc); copy_v3_v3(me->size, cu->size); - copy_v3_v3(me->rot, cu->rot); BKE_mesh_texspace_calc(me); cu->mat = NULL; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index de712173e8f..f10930a2ba7 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3269,8 +3269,7 @@ void BKE_object_sculpt_data_create(Object *ob) ob->sculpt->mode_type = ob->mode; } -int BKE_object_obdata_texspace_get( - Object *ob, short **r_texflag, float **r_loc, float **r_size, float **r_rot) +int BKE_object_obdata_texspace_get(Object *ob, short **r_texflag, float **r_loc, float **r_size) { if (ob->data == NULL) { @@ -3279,7 +3278,7 @@ int BKE_object_obdata_texspace_get( switch (GS(((ID *)ob->data)->name)) { case ID_ME: { - BKE_mesh_texspace_get_reference((Mesh *)ob->data, r_texflag, r_loc, r_rot, r_size); + BKE_mesh_texspace_get_reference((Mesh *)ob->data, r_texflag, r_loc, r_size); break; } case ID_CU: { @@ -3294,9 +3293,6 @@ int BKE_object_obdata_texspace_get( if (r_size) { *r_size = cu->size; } - if (r_rot) { - *r_rot = cu->rot; - } break; } case ID_MB: { @@ -3310,9 +3306,6 @@ int BKE_object_obdata_texspace_get( if (r_size) { *r_size = mb->size; } - if (r_rot) { - *r_rot = mb->rot; - } break; } default: -- cgit v1.2.3