archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Depsgraph: Fix crash when updating materials with copy on write enabled

Browse Source 
The code was freeing GPU materials from non-main thread.
This commit is contained in:
Sergey Sharybin
2017-07-20 17:45:00 +02:00
parent dfcb568c16
commit 3ededb19d8
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
View File

@@ -664,9 +664,38 @@ ID *deg_update_copy_on_write_datablock(/*const*/ Depsgraph *depsgraph,
/* For the rest if datablock types we use simple logic: /* For the rest if datablock types we use simple logic:
* - Free previously expanded data, if any. * - Free previously expanded data, if any.
* - Perform full datablock copy. * - Perform full datablock copy.
*
* Note that we never free GPU materials from here since that's not
* safe for threading and GPU materials are likely to be re-used.
*/ */
ListBase gpumaterial_backup;
ListBase *gpumaterial_ptr = NULL;
if (check_datablock_expanded(id_cow)) {
switch (GS(id_orig->name)) {
case ID_MA:
{
Material *material = (Material *)id_cow;
gpumaterial_ptr = &material->gpumaterial;
break;
}
case ID_WO:
{
World *world = (World *)id_cow;
gpumaterial_ptr = &world->gpumaterial;
break;
}
}
if (gpumaterial_ptr != NULL) {
gpumaterial_backup = *gpumaterial_ptr;
gpumaterial_ptr->first = gpumaterial_ptr->last = NULL;
}
}
deg_free_copy_on_write_datablock(id_cow); deg_free_copy_on_write_datablock(id_cow);
deg_expand_copy_on_write_datablock(depsgraph, id_node, false); deg_expand_copy_on_write_datablock(depsgraph, id_node, false);
/* Restore GPU materials. */
if (gpumaterial_ptr != NULL) {
*gpumaterial_ptr = gpumaterial_backup;
}
return id_cow; return id_cow;
} }