[Bf-blender-cvs] [649c8d6] particles_refactor: Copy the particle state when copying an attribute.

Lukas Tönne noreply at git.blender.org
Tue Apr 22 12:05:42 CEST 2014


Commit: 649c8d690937edb5412077bb510352df7b6aff8f
Author: Lukas Tönne
Date:   Sun Dec 15 11:49:03 2013 +0100
https://developer.blender.org/rB649c8d690937edb5412077bb510352df7b6aff8f

Copy the particle state when copying an attribute.

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

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

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

diff --git a/source/blender/blenkernel/intern/nparticle.c b/source/blender/blenkernel/intern/nparticle.c
index 9f2798c..16f06ca 100644
--- a/source/blender/blenkernel/intern/nparticle.c
+++ b/source/blender/blenkernel/intern/nparticle.c
@@ -175,7 +175,7 @@ NParticleAttribute *BKE_nparticle_attribute_copy(NParticleSystem *to_psys, NPart
 	NParticleAttribute *to_attr = MEM_dupallocN(from_attr);
 	
 	to_attr->state = MEM_callocN(sizeof(NParticleAttributeState), "particle attribute state");
-	nparticle_attribute_state_init(to_attr, to_attr->state);
+	nparticle_attribute_state_copy(to_attr->state, from_attr->state);
 	
 	BLI_addtail(&to_psys->attributes, to_attr);
 	return to_attr;




More information about the Bf-blender-cvs mailing list