Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel/intern/pointcache.c')
-rw-r--r--source/blender/blenkernel/intern/pointcache.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 8ee8821eeb6..17434ee8023 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -653,7 +653,10 @@ static void ptcache_cloth_error(const ID *owner_id, void *cloth_v, const char *m
{
ClothModifierData *clmd = cloth_v;
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))