blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix T102612: Line art crash on loading due to references to other scenes.

This commit is contained in:
YimingWu 2023-01-05 12:43:05 +08:00
parent 168091a1d6
commit 93fc352cfa
Notes: blender-bot 2024-03-22 15:57:27 +01:00 
Referenced by issue #100749, Blender LTS: Maintenance Task 3.3
Referenced by issue #102612, Regression: LineArt crash on file load
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc
View File

@ -2450,9 +2450,10 @@ static void lineart_object_load_single_instance(LineartData *ld,
}
if (ob->type == OB_MESH) {
use_mesh = BKE_object_get_evaluated_mesh(ob);
if (use_mesh->edit_mesh) {
if ((!use_mesh) || use_mesh->edit_mesh) {
/* If the object is being edited, then the mesh is not evaluated fully into the final
* result, do not load them. */
* result, do not load them. This could be caused by incorrect evaluation order due to
* the way line art uses depsgraph.See T102612 for explaination of this workaround. */
return;
}
}
@ -2460,7 +2461,7 @@ static void lineart_object_load_single_instance(LineartData *ld,
use_mesh = BKE_mesh_new_from_object(depsgraph, ob, true, true);
}
/* In case we still can not get any mesh geometry data from the object */
/* In case we still can not get any mesh geometry data from the object, same as above. */
if (!use_mesh) {
return;
}