diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-23 16:31:11 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-23 17:27:23 +0300 |
commit | 9208146199019e111711f077abcda31f976cabcc (patch) | |
tree | df287ca58b1f8d6d27ecb19f6bd02de8d5b39249 /source/blender/draw | |
parent | 5c89c689db5c68602aecb55a0a7891059021eeaf (diff) |
Cleanup: remove Mesh.bb and Curve.bb, no reason for these to be persistent
These were only strictly valid for texture space calculation, don't store them
since they should not be used after that. Only store a flag to indicate if the
auto texture space has been evaluated.
In the future it might make sense to store bounding boxes at the mesh level to
speed up bounding box computation for multiple objects using the same mesh, but
then it will need to be implemented differently.
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/object_mode.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 48dad57d3ba..d73f8fd5165 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -451,9 +451,7 @@ static void drw_call_calc_orco(Object *ob, float (*r_orcofacs)[4]) break; case ID_CU: { Curve *cu = (Curve *)ob_data; - if (cu->bb == NULL || (cu->bb->flag & BOUNDBOX_DIRTY)) { - BKE_curve_texspace_calc(cu); - } + BKE_curve_texspace_ensure(cu); texcoloc = cu->loc; texcosize = cu->size; break; diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 97e6c2dd6f1..654393cfc60 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -3023,9 +3023,7 @@ static void DRW_shgroup_texture_space(OBJECT_ShadingGroupList *sgl, Object *ob, break; case ID_CU: { Curve *cu = (Curve *)ob_data; - if (cu->bb == NULL || (cu->bb->flag & BOUNDBOX_DIRTY)) { - BKE_curve_texspace_calc(cu); - } + BKE_curve_texspace_ensure(cu); texcoloc = cu->loc; texcosize = cu->size; break; |