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:
authorLukas Tönne <lukas.toenne@gmail.com>2015-01-13 19:59:41 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-01-20 11:30:10 +0300
commit374188cdfe42d050886826fc8fad92756d866cc6 (patch)
treeb81dcc110a490c0bdb0701aad0470e74ea08b34b /source/blender/blenkernel/intern/particle_child.c
parent14af65b3ef499ed50c5de90102ade7187cbb9db9 (diff)
Disable the path length check for spiral kink mode.
This test is terribly expensive for some reason and not necessary for for the spiral mode anyway.
Diffstat (limited to 'source/blender/blenkernel/intern/particle_child.c')
-rw-r--r--source/blender/blenkernel/intern/particle_child.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_child.c b/source/blender/blenkernel/intern/particle_child.c
index ae95b8f644d..9471274cd22 100644
--- a/source/blender/blenkernel/intern/particle_child.c
+++ b/source/blender/blenkernel/intern/particle_child.c
@@ -301,6 +301,7 @@ void psys_apply_child_modifiers(ParticleThreadContext *ctx, struct ListBase *mod
struct ParticleSettings *part = ctx->sim.psys->part;
struct Material *ma = ctx->ma;
const bool draw_col_ma = (part->draw_col == PART_DRAW_COL_MAT);
+ const bool use_length_check = !ELEM(part->kink, PART_KINK_SPIRAL);
ParticlePathModifier *mod;
ParticleCacheKey *key;
@@ -352,7 +353,7 @@ void psys_apply_child_modifiers(ParticleThreadContext *ctx, struct ListBase *mod
sub_v3_v3v3(key->vel, key->co, (key-1)->co);
}
- if (k > 1) {
+ if (use_length_check && k > 1) {
float dvec[3];
/* check if path needs to be cut before actual end of data points */
if (!check_path_length(k, keys, key, max_length, step_length, &cur_length, dvec))