diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-08-19 13:58:28 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-08-19 13:58:28 +0400 |
commit | f030758515f5b1ecaf4ff9b9454094ec9aae1ffb (patch) | |
tree | 939587496f0539af0c3b0de1c830d80c2ea1c734 /source/blender/blenkernel/intern/curve.c | |
parent | 2dcb1d70022e06eedfe7339930c3191a8859e7c4 (diff) |
Tag object-data level boundbox as invalid rather than freeing it
Object update used to free object-data level bounding box to trigger
it's re-calculation in the future. Such a freeing performed from
object update isn't thread-safe because mesh could be shared between
multiple objects.
Rather than freeing bounding box, tag it's as invalid, this is safe
from threading point of view and also prevents unnecessary memory
re-allocation.
Object-level bounding box is still reallocating, but think we could
change this easily in the future as well.
--
svn merge -r58154:58156 -r59258:59259 ^/branches/soc-2013-depsgraph_mt
Diffstat (limited to 'source/blender/blenkernel/intern/curve.c')
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 120080665d7..c0d0ce595f2 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -394,8 +394,34 @@ void BKE_curve_texspace_calc(Curve *cu) if (cu->size[2] == 0.0f) cu->size[2] = 1.0f; else if (cu->size[2] > 0.0f && cu->size[2] < 0.00001f) cu->size[2] = 0.00001f; else if (cu->size[2] < 0.0f && cu->size[2] > -0.00001f) cu->size[2] = -0.00001f; + } + + cu->bb->flag &= ~BOUNDBOX_DIRTY; +} + +BoundBox *BKE_curve_boundbox_get(Object *ob) +{ + Curve *cu = ob->data; + + if (ob->bb) + return ob->bb; + if (cu->bb == NULL || (cu->bb->flag & BOUNDBOX_DIRTY)) { + BKE_curve_texspace_calc(cu); } + + return cu->bb; +} + +void BKE_curve_texspace_get(Curve *cu, float r_loc[3], float r_rot[3], float r_size[3]) +{ + if (cu->bb == NULL || (cu->bb->flag & BOUNDBOX_DIRTY)) { + BKE_curve_texspace_calc(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); } int BKE_nurbList_index_get_co(ListBase *nurb, const int index, float r_co[3]) |