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:
authorPhilipp Oeser <info@graphics-engineer.com>2019-09-13 11:40:42 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-09-13 23:15:58 +0300
commit89cc5c2bd3ba2424881cc02de2e820ac5353fc14 (patch)
treebb3c169b8a8fc6ff811ba4024d9c48603fbfe093 /source/blender/draw/intern/draw_cache_impl_particles.c
parent2520f78971748040e48a370f2517826ad4cdf10e (diff)
Fix Particles: Keyed Physics crash when clicking on a particle slot
without a valid target rB95b9680597f5 introduced code that would skip creation of GPUVertBuf for ParticlePointCache if the keyed physics would not have a valid target. Missing vertex buffer would lead to assert/crash. This code is now removed (dont see a reason why this was done? afaict 2.79 also just displayed the particles without physics in this case and this seems to be working just fine in 2.8 as well) part of T69741 Reviewers: fclem Maniphest Tasks: T69741 Differential Revision: https://developer.blender.org/D5781
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_particles.c')
-rw-r--r--source/blender/draw/intern/draw_cache_impl_particles.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c
index ed78f7d07f9..3c586e6daec 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -1335,15 +1335,6 @@ static void particle_batch_cache_ensure_pos(Object *object,
sim.psmd = psys_get_modifier(object, psys);
sim.psys->lattice_deform_data = psys_create_lattice_deform_data(&sim);
- if (psys->part->phystype == PART_PHYS_KEYED) {
- if (psys->flag & PSYS_KEYED) {
- psys_count_keyed_targets(&sim);
- if (psys->totkeyed == 0) {
- return;
- }
- }
- }
-
GPU_VERTBUF_DISCARD_SAFE(point_cache->pos);
if (format.attr_len == 0) {