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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-05-15 12:48:33 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-05-15 18:20:02 +0300
commitc5f469da5ed7e3518890b933aa93e61670a48cd4 (patch)
tree7d9ed4b85d6b12ce81e3ec3afa4971dd4f7971d0 /source/blender/blenkernel/intern/particle_system.c
parentaa312621dc33253bcf2f8947f42d23fe93a77468 (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/intern/particle_system.c')
-rw-r--r--source/blender/blenkernel/intern/particle_system.c2
1 files changed, 0 insertions, 2 deletions
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
}
}