diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2022-10-24 20:33:11 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2022-10-24 20:33:11 +0300 |
| commit | a41a1bfc494e4015406549e137114ef5a450aaf0 (patch) | |
| tree | dbdc95584f91aded4b777bac30074f9f78d8c89c /source/blender/blenkernel/intern/particle_distribute.c | |
| parent | fc8f9e420426570dcb3e026ecbe8145cd0fae5ca (diff) | |
| parent | 53795877727d67185de858a480c8090ca7eb8e36 (diff) | |
Merge branch 'master' into bevelv2
Diffstat (limited to 'source/blender/blenkernel/intern/particle_distribute.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_distribute.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c index 4c56a8a9275..0301b83a043 100644 --- a/source/blender/blenkernel/intern/particle_distribute.c +++ b/source/blender/blenkernel/intern/particle_distribute.c @@ -29,6 +29,7 @@ #include "BKE_lib_id.h" #include "BKE_mesh.h" #include "BKE_mesh_legacy_convert.h" +#include "BKE_mesh_runtime.h" #include "BKE_object.h" #include "BKE_particle.h" @@ -899,7 +900,7 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, return 0; } - if (!final_mesh->runtime.deformed_only && + if (!BKE_mesh_is_deformed_only(final_mesh) && !CustomData_get_layer(&final_mesh->fdata, CD_ORIGINDEX)) { printf( "Can't create particles with the current modifier stack, disable destructive modifiers\n"); |