griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #122451: Crash on animated viewport visibility + animated mesh positions

Browse Source 
If an object is hidden it is unsafe to look deep into its properties, such
as evaluated mesh state. Do early visibility checks to avoid accessing
possibly stake pointers.

Pull Request: https://projects.blender.org/blender/blender/pulls/122496
This commit is contained in:
Sergey Sharybin
2024-05-30 17:34:48 +02:00
committed by Sergey Sharybin
parent 95966813ae
commit 2fc2280e0e
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/depsgraph/intern/depsgraph_query_iter.cc
View File

@@ -239,7 +239,15 @@ bool deg_iterator_objects_step(DEGObjectIterData *data)
Object *object = (Object *)id_node->id_cow;
Object *object_orig = DEG_get_original_object(object);
BLI_assert(deg::deg_validate_eval_copy_datablock(&object->id));
/* NOTE: The object might be invisible after the latest depsgraph evaluation, in which case
* going into its evaluated state might not be safe. For example, its evaluated mesh state
* might point to a freed data-block if the mesh is animated.
* So it is required to perform the visibility checks prior to looking into any deeper into the
* object. */
BLI_assert(deg::deg_eval_copy_is_expanded(&object->id));
object->runtime->select_id = object_orig->runtime->select_id;
const bool use_preview = object_orig == data->object_orig_with_preview;
@@ -264,12 +272,14 @@ bool deg_iterator_objects_step(DEGObjectIterData *data)
if ((data->flag & DEG_ITER_OBJECT_FLAG_DUPLI) &&
((object->transflag & OB_DUPLI) || object->runtime->geometry_set_eval != nullptr))
{
BLI_assert(deg::deg_validate_eval_copy_datablock(&object->id));
ListBase *duplis = object_duplilist(data->graph, data->scene, object);
deg_iterator_duplis_init(data, object, duplis);
}
}
if (ob_visibility & (OB_VISIBLE_SELF | OB_VISIBLE_PARTICLES)) {
BLI_assert(deg::deg_validate_eval_copy_datablock(&object->id));
data->next_object = object;
}
data->id_node_index++;

6
source/blender/draw/engines/overlay/overlay_paint.cc
View File

@@ -30,7 +30,11 @@ static bool paint_object_is_rendered_transparent(View3D *v3d, Object *ob)
if (ob && v3d->shading.color_type == V3D_SHADING_OBJECT_COLOR) {
return ob->color[3] < 1.0f;
}
if (ob && ob->type == OB_MESH && ob->data &&
/* NOTE: The active object might be hidden and hence have inconsistent evaluated state of its
* mesh data. So only perform checks dependent on mesh after checking the object is actually
* visible. */
if (ob && ob->type == OB_MESH && BKE_object_is_visible_in_viewport(v3d, ob) && ob->data &&
v3d->shading.color_type == V3D_SHADING_MATERIAL_COLOR)
{
Mesh *mesh = static_cast<Mesh *>(ob->data);