[Bf-blender-cvs] [4472309] particles_refactor: Added collision shape pointer attribute for particles. This will change soon, for now is the easiest way to keep track of things.

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


Commit: 4472309bdd66aa839538c50c56ac030a5b42ef2f
Author: Lukas Tönne
Date:   Wed Jan 1 12:49:54 2014 +0100
https://developer.blender.org/rB4472309bdd66aa839538c50c56ac030a5b42ef2f

Added collision shape pointer attribute for particles. This will change
soon, for now is the easiest way to keep track of things.

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

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

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

diff --git a/source/blender/blenkernel/intern/nparticle.c b/source/blender/blenkernel/intern/nparticle.c
index 5c0ec87..940f525 100644
--- a/source/blender/blenkernel/intern/nparticle.c
+++ b/source/blender/blenkernel/intern/nparticle.c
@@ -169,7 +169,8 @@ static void nparticle_system_default_attributes(NParticleSystem *psys)
 	BKE_nparticle_attribute_new(psys, "position", PAR_ATTR_DATATYPE_POINT, PAR_ATTR_PROTECTED);
 	
 	/* XXX bullet RB pointers, this should be based on actual simulation settings and requirements */
-	BKE_nparticle_attribute_new(psys, "rigidbody", PAR_ATTR_DATATYPE_POINTER, PAR_ATTR_PROTECTED | PAR_ATTR_READONLY | PAR_ATTR_TEMPORARY);
+	BKE_nparticle_attribute_new(psys, "rigid_body", PAR_ATTR_DATATYPE_POINTER, PAR_ATTR_PROTECTED | PAR_ATTR_TEMPORARY);
+	BKE_nparticle_attribute_new(psys, "collision_shape", PAR_ATTR_DATATYPE_POINTER, PAR_ATTR_PROTECTED | PAR_ATTR_TEMPORARY);
 }
 
 NParticleSystem *BKE_nparticle_system_new(void)




More information about the Bf-blender-cvs mailing list