diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-15 12:48:33 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-15 18:20:02 +0300 |
| commit | c5f469da5ed7e3518890b933aa93e61670a48cd4 (patch) | |
| tree | 7d9ed4b85d6b12ce81e3ec3afa4971dd4f7971d0 /source/blender/blenkernel | |
| parent | aa312621dc33253bcf2f8947f42d23fe93a77468 (diff) | |
Particle edit: Restore weird-looking conditions in evaluation
They might be looking weird, but they match conditions when children particles
are to be re-calculated for particle edit.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index f5950528a86..e24b6b3903b 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -2369,9 +2369,7 @@ static void cache_key_incremental_rotation(ParticleCacheKey *key0, ParticleCache void psys_cache_paths(ParticleSimulationData *sim, float cfra, const bool use_render_params) { PARTICLE_PSMD; -#if 0 ParticleEditSettings *pset = &sim->scene->toolsettings->particle; -#endif ParticleSystem *psys = sim->psys; ParticleSettings *part = psys->part; ParticleCacheKey *ca, **cache; @@ -2403,11 +2401,9 @@ void psys_cache_paths(ParticleSimulationData *sim, float cfra, const bool use_re if ((psys->flag & PSYS_HAIR_DONE || psys->flag & PSYS_KEYED || psys->pointcache) == 0) return; -#if 0 /* TODO(mai): something is very wrong with these conditionals, they dont make sense and the cache isnt updating */ if (psys_in_edit_mode(sim->depsgraph, psys)) if ((psys->edit == NULL || pset->flag & PE_DRAW_PART) == 0) return; -#endif keyed = psys->flag & PSYS_KEYED; baked = psys->pointcache->mem_cache.first && psys->part->type != PART_HAIR; diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index bc3218723ac..74348246da2 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2945,10 +2945,8 @@ static void psys_update_path_cache(ParticleSimulationData *sim, float cfra, cons else if (psys_in_edit_mode(sim->depsgraph, psys)) { if ((pset->flag & PE_DRAW_PART)==0) skip = 1; -#if 0 /* TODO(mai): something is very wrong with these conditionals, they dont make sense and the cache isnt updating */ else if (part->childtype==0 && (psys->flag & PSYS_HAIR_DYNAMICS && psys->pointcache->flag & PTCACHE_BAKED)==0) skip = 1; /* in edit mode paths are needed for child particles and dynamic hair */ -#endif } } |