[Bf-blender-cvs] [7f959eb] temp_merge_gooseberry_hair: Removed unused old code.

Lukas Tönne noreply at git.blender.org
Mon Jan 19 20:51:49 CET 2015


Commit: 7f959eb4ca36165a032d4c7d38e481d2655148fe
Author: Lukas Tönne
Date:   Tue Jan 13 18:03:47 2015 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB7f959eb4ca36165a032d4c7d38e481d2655148fe

Removed unused old code.

===================================================================

M	source/blender/blenkernel/intern/particle.c
M	source/blender/blenkernel/intern/particle_child.c

===================================================================

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 3276fe8..e0c7eaa 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2258,60 +2258,6 @@ static void psys_thread_create_path(ParticleTask *task, struct ChildParticle *cp
 			psys_apply_child_modifiers(ctx, &modifiers, cpa, &ptex, orco, ornor, hairmat, child_keys, par, par_orco);
 		}
 	}
-#if 0
-	for (k = 0, child = child_keys; k <= ctx->steps; k++, child++) {
-		t = (float)k / (float)ctx->steps;
-
-		if (ctx->totparent)
-			/* this is now threadsafe, virtual parents are calculated before rest of children */
-			par = (i >= ctx->totparent) ? cache[cpa->parent] : NULL;
-		else if (cpa->parent >= 0)
-			par = pcache[cpa->parent];
-
-		if (par) {
-			if (k) {
-				mul_qt_qtqt(rot, (par + k)->rot, par->rot);
-				par_rot = rot;
-			}
-			else {
-				par_rot = par->rot;
-			}
-			par += k;
-		}
-
-		/* apply different deformations to the child path */
-		do_child_modifiers(&ctx->sim, &ptex, (ParticleKey *)par, par_rot, cpa, orco, hairmat, (ParticleKey *)child, t);
-
-		/* we have to correct velocity because of kink & clump */
-		if (k > 1) {
-			sub_v3_v3v3((child - 1)->vel, child->co, (child - 2)->co);
-			mul_v3_fl((child - 1)->vel, 0.5);
-
-			if (ctx->ma && (part->draw_col == PART_DRAW_COL_MAT))
-				get_strand_normal(ctx->ma, ornor, cur_length, (child - 1)->vel);
-		}
-
-		if (k == ctx->steps)
-			sub_v3_v3v3(child->vel, child->co, (child - 1)->co);
-
-		/* check if path needs to be cut before actual end of data points */
-		if (k) {
-			sub_v3_v3v3(dvec, child->co, (child - 1)->co);
-			length = 1.0f / (float)ctx->steps;
-			k = check_path_length(k, child_keys, child, max_length, &cur_length, length, dvec);
-		}
-		else {
-			/* initialize length calculation */
-			max_length = ptex.length;
-			cur_length = 0.0f;
-		}
-
-		if (ctx->ma && (part->draw_col == PART_DRAW_COL_MAT)) {
-			copy_v3_v3(child->col, &ctx->ma->r);
-			get_strand_normal(ctx->ma, ornor, cur_length, child->vel);
-		}
-	}
-#endif
 
 	/* Hide virtual parents */
 	if (i < ctx->totparent)
diff --git a/source/blender/blenkernel/intern/particle_child.c b/source/blender/blenkernel/intern/particle_child.c
index 9471274..518aa49 100644
--- a/source/blender/blenkernel/intern/particle_child.c
+++ b/source/blender/blenkernel/intern/particle_child.c
@@ -238,19 +238,6 @@ static void do_kink_spiral(ParticleThreadContext *ctx, ParticleTexture *ptex, co
 		len += seglen;
 	}
 	
-#if 0
-	/* use the last segment's direction for the spiral orientation
-	 * this is more consistent and stable than the last flat segment
-	 * when changing the amplitude
-	 */
-	if (totkeys > 1) {
-		sub_v3_v3v3(dir, (keys+totkeys-1)->co, (keys+totkeys-2)->co);
-		normalize_v3(dir);
-	}
-	else
-		zero_v3(dir);
-#endif
-	
 	zero_v3(dir);
 	for (k = 0, key = keys; k < end_index; k++, key++) {
 		psys_path_iter_get(&iter, keys, end_index, NULL, k);




More information about the Bf-blender-cvs mailing list