[Bf-blender-cvs] [6a37056] particles_refactor: Removed rigidbody build/apply functions from NParticle API. It's better to keep this functionality inside RigidBody blenkernel for now.

[Lukas Tönne]

Commit: 6a3705690f5639fb1b0b2186fd22d53138453a35
Author: Lukas Tönne
Date:   Wed Jan 1 13:52:16 2014 +0100
https://developer.blender.org/rB6a3705690f5639fb1b0b2186fd22d53138453a35

Removed rigidbody build/apply functions from NParticle API. It's better
to keep this functionality inside RigidBody blenkernel for now.

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

M	source/blender/blenkernel/BKE_nparticle.h
M	source/blender/blenkernel/intern/nparticle.c
M	source/blender/blenkernel/intern/rigidbody.c

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

diff --git a/source/blender/blenkernel/BKE_nparticle.h b/source/blender/blenkernel/BKE_nparticle.h
index e4fdff3..dabe947 100644
--- a/source/blender/blenkernel/BKE_nparticle.h
+++ b/source/blender/blenkernel/BKE_nparticle.h
@@ -118,11 +118,4 @@ struct NParticleDisplay *BKE_nparticle_display_particle(void);
 struct NParticleDisplay *BKE_nparticle_display_copy(struct NParticleDisplay *display);
 void BKE_nparticle_display_free(struct NParticleDisplay *display);
 
-
-struct Object;
-struct RigidBodyWorld;
-
-void BKE_nparticle_system_update_rigid_body(struct RigidBodyWorld *rbw, struct Object *ob, struct NParticleSystem *psys);
-void BKE_nparticle_system_apply_rigid_body(struct RigidBodyWorld *rbw, struct Object *ob, struct NParticleSystem *psys);
-
 #endif /* BKE_NPARTICLE_H */
diff --git a/source/blender/blenkernel/intern/nparticle.c b/source/blender/blenkernel/intern/nparticle.c
index 940f525..698f011 100644
--- a/source/blender/blenkernel/intern/nparticle.c
+++ b/source/blender/blenkernel/intern/nparticle.c
@@ -613,14 +613,3 @@ void BKE_nparticle_display_free(NParticleDisplay *display)
 {
 	MEM_freeN(display);
 }
-
-
-void BKE_nparticle_system_update_rigid_body(RigidBodyWorld *rbw, Object *ob, NParticleSystem *psys)
-{
-	
-}
-
-void BKE_nparticle_system_apply_rigid_body(RigidBodyWorld *rbw, Object *ob, NParticleSystem *psys)
-{
-	
-}
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 34432aa..eeebd7d 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -1383,6 +1383,10 @@ static void rigidbody_world_apply_object(Scene *UNUSED(scene), RigidBodyWorld *U
 	}
 }
 
+static void rigidbody_world_apply_particles(Scene *UNUSED(scene), RigidBodyWorld *UNUSED(rbw), Object *ob, NParticleSystem *psys)
+{
+}
+
 static void rigidbody_world_apply(Scene *scene, RigidBodyWorld *rbw)
 {
 	GroupObject *go;
@@ -1399,7 +1403,7 @@ static void rigidbody_world_apply(Scene *scene, RigidBodyWorld *rbw)
 		for (md = ob->modifiers.first; md; md = md->next) {
 			if (md->type == eModifierType_NParticleSystem) {
 				NParticleSystemModifierData *pmd = (NParticleSystemModifierData*)md;
-				BKE_nparticle_system_apply_rigid_body(rbw, ob, pmd->psys);
+				rigidbody_world_apply_particles(scene, rbw, ob, pmd->psys);
 			}
 		}
 	}