[Bf-blender-cvs] [41920e0] temp_merge_gooseberry_hair: Fix for calculation of the key velocity on the last child hair segment.

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


Commit: 41920e02ec486b718f319a46637448d8c62e3218
Author: Lukas Tönne
Date:   Tue Jan 13 17:28:53 2015 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB41920e02ec486b718f319a46637448d8c62e3218

Fix for calculation of the key velocity on the last child hair segment.

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

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

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

diff --git a/source/blender/blenkernel/intern/particle_child.c b/source/blender/blenkernel/intern/particle_child.c
index ea95255..ae95b8f 100644
--- a/source/blender/blenkernel/intern/particle_child.c
+++ b/source/blender/blenkernel/intern/particle_child.c
@@ -347,7 +347,7 @@ void psys_apply_child_modifiers(ParticleThreadContext *ctx, struct ListBase *mod
 				if (ma && draw_col_ma)
 					get_strand_normal(ma, ornor, cur_length, (key-1)->vel);
 			}
-			else if (k == totkeys-1) {
+			if (k == totkeys-1) {
 				/* last key */
 				sub_v3_v3v3(key->vel, key->co, (key-1)->co);
 			}




More information about the Bf-blender-cvs mailing list