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

Fix: tried to set error message on modifier that does not exist

Browse Source 
Without this, the example file in T83730 crashes in a debug build
when deleting the hair edit bake in the particle settings.
This commit is contained in:
Jacques Lucke
2021-01-05 16:50:10 +01:00
parent 9dbea1db66
commit 39f99fd05c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/pointcache.c
View File

@@ -653,7 +653,10 @@ static void ptcache_cloth_error(const ID *owner_id, void *cloth_v, const char *m
{ {
ClothModifierData *clmd = cloth_v; ClothModifierData *clmd = cloth_v;
BLI_assert(GS(owner_id->name) == ID_OB); BLI_assert(GS(owner_id->name) == ID_OB);
BKE_modifier_set_error((Object *)owner_id, &clmd->modifier, "%s", message); if (clmd->hairdata == NULL) {
/* If there is hair data, this modifier does not actually exist on the object. */
BKE_modifier_set_error((Object *)owner_id, &clmd->modifier, "%s", message);
}
} }
static int ptcache_dynamicpaint_totpoint(void *sd, int UNUSED(cfra)) static int ptcache_dynamicpaint_totpoint(void *sd, int UNUSED(cfra))