blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 744 Projects 19 Wiki Activity

Fix race condition invalidating object data's bounding box

This commit is contained in:
Sergey Sharybin 2017-04-26 15:40:32 +02:00
parent e61ba39e7c
commit e6954a5a7c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/object.c
View File

@ -127,6 +127,7 @@
#endif
#include "CCGSubSurf.h"
#include "atomic_ops.h"
#include "GPU_material.h"
@ -319,19 +320,24 @@ void BKE_object_link_modifiers(struct Object *ob_dst, const struct Object *ob_sr
/* free data derived from mesh, called when mesh changes or is freed */
void BKE_object_free_derived_caches(Object *ob)
{
/* also serves as signal to remake texspace */
/* Also serves as signal to remake texspace.
*
* NOTE: This function can be called from threads on different objects
* sharing same data datablock. So we need to ensure atomic nature of
* data modification here.
*/
if (ob->type == OB_MESH) {
Mesh *me = ob->data;
if (me && me->bb) {
me->bb->flag |= BOUNDBOX_DIRTY;
atomic_fetch_and_or_uint32((uint*)&me->bb->flag, BOUNDBOX_DIRTY);
}
}
else if (ELEM(ob->type, OB_SURF, OB_CURVE, OB_FONT)) {
Curve *cu = ob->data;
if (cu && cu->bb) {
cu->bb->flag |= BOUNDBOX_DIRTY;
atomic_fetch_and_or_uint32((uint*)&cu->bb->flag, BOUNDBOX_DIRTY);
}
}