kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T38284: Crash with several shrinkwrap constraint using same target

Browse Source 
Issue is caused by the race condition between getting custom data layers
from target's derived mesh (for vertices and faces) and releasing this
derived mesh from other threads.

When one releases the derived mesh it'll free temporary data from it,
and it'll also update data layers mapping.

General rule for threading is that no one is ever allowed to modify
data he doesn't own. This means that no temp layers are to be allocated
in derived mesh and making it so `CustomData_free_temporary()` doesn't
update mapping if nothing was freed will solve the race condition.

It is still possible to do other improvements, namely detect which
additional data/layers are to be present in derived mesh and create
it as a part of `object_handle_update()`, but this is to be solved
separately.
This commit is contained in:
Sergey Sharybin 2014-01-23 16:24:41 +06:00
parent 6c1c6f22ce
commit cbdedc169d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenkernel/intern/customdata.c
View File

@ -1914,6 +1914,7 @@ void CustomData_free_temporary(CustomData *data, int totelem)
{
CustomDataLayer *layer;
int i, j;
bool changed = false;
for (i = 0, j = 0; i < data->totlayer; ++i) {
layer = &data->layers[i];
@ -1921,18 +1922,24 @@ void CustomData_free_temporary(CustomData *data, int totelem)
if (i != j)
data->layers[j] = data->layers[i];
if ((layer->flag & CD_FLAG_TEMPORARY) == CD_FLAG_TEMPORARY)
if ((layer->flag & CD_FLAG_TEMPORARY) == CD_FLAG_TEMPORARY) {
customData_free_layer__internal(layer, totelem);
changed = true;
}
else
j++;
}
data->totlayer = j;
if (data->totlayer <= data->maxlayer - CUSTOMDATA_GROW)
if (data->totlayer <= data->maxlayer - CUSTOMDATA_GROW) {
customData_resize(data, -CUSTOMDATA_GROW);
changed = true;
}
customData_update_offsets(data);
if (changed) {
customData_update_offsets(data);
}
}
void CustomData_set_only_copy(const struct CustomData *data,