[Bf-blender-cvs] [35b7f1b] temp_merge_gooseberry_hair: Fix for inverted condition: hair data needs to be rebuilt when the cloth DM does not exist.

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


Commit: 35b7f1b18d8e10ef594b8866a4454dd7e1a5e8d7
Author: Lukas Tönne
Date:   Mon Jan 19 18:44:56 2015 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB35b7f1b18d8e10ef594b8866a4454dd7e1a5e8d7

Fix for inverted condition: hair data needs to be rebuilt when the
cloth DM does not exist.

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

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

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

diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 88df5d3..97dd70b 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -4184,7 +4184,7 @@ static void do_hair_dynamics(ParticleSimulationData *sim)
 		}
 	}
 	
-	if (psys->hair_in_dm || !psys->clmd->roots || realloc_roots) {
+	if (!psys->hair_in_dm || !psys->clmd->roots || realloc_roots) {
 		if (psys->clmd->roots) {
 			MEM_freeN(psys->clmd->roots);
 			psys->clmd->roots = NULL;




More information about the Bf-blender-cvs mailing list