[Bf-blender-cvs] [2ab499c] particles_refactor: Cleanup: disabled old modifier solution for now.

[Lukas Tönne]

Commit: 2ab499cd1dc1b1b7c5a8033a98c76503a2e676a5
Author: Lukas Tönne
Date:   Tue Jun 4 11:01:14 2013 +0200
https://developer.blender.org/rB2ab499cd1dc1b1b7c5a8033a98c76503a2e676a5

Cleanup: disabled old modifier solution for now.

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

M	source/blender/makesdna/DNA_nparticle_types.h
M	source/blender/modifiers/intern/MOD_nparticle.c

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

diff --git a/source/blender/makesdna/DNA_nparticle_types.h b/source/blender/makesdna/DNA_nparticle_types.h
index 8fa5d36..aea3480 100644
--- a/source/blender/makesdna/DNA_nparticle_types.h
+++ b/source/blender/makesdna/DNA_nparticle_types.h
@@ -142,43 +142,19 @@ typedef struct NParticleMeshLocation {
 /* **************** */
 
 
+typedef struct bNodeInstanceMap {
+	/* XXX for now just a simple ListBase, might use a hash later on */
+	ListBase lb;
+} bNodeInstanceMap;
+
 typedef struct ParticleBuffer {
 	bPagedBuffer data;
 	
 	ListBase attributes;
-	/* map for standard attribute types.
-	 * XXX array size is arbitrary, just must be big enough for all attribute types.
-	 */
-	struct NParticleAttribute *standard_attribute[32];
-	struct NParticleAttribute *active_attribute;	/* selected attribute in UI */
-	
-	bNodePathMap node_path_map;
-	int next_source_id;
-	int pad;
 } ParticleBuffer;
 
-/* particle flags */
-enum NParParticleFlag {
-	NPAR_DEAD		= 1
-};
-
-/* size of NParticleSystem standard_attribute array */
-#define PAR_ATTR_TYPE_MAX	32
-
-/* particle nodetree types
- * used as bit flags for filtering, make sure these are powers of 2!
- */
-enum NParNodeTreeType {
-	PAR_NODETREE_ALL            = 0xFFFF,
-	PAR_NODETREE_SYSTEM         = 1,
-	PAR_NODETREE_EMITTER        = 2,
-	PAR_NODETREE_MODIFIER       = 4
-};
-
 
 typedef struct NParticleSource {
-	bNodeInstance base;
-	
 	int id;
 	int next_element_id;
 	NParticleRNG rng;
@@ -190,12 +166,4 @@ typedef struct NParticleSource {
 	int pad;
 } NParticleSource;
 
-/* particle node integrator modes */
-enum NParIntegratorMode {
-	PAR_INTEGRATE_EULER		= 0,
-	PAR_INTEGRATE_VERLET	= 1,
-	PAR_INTEGRATE_MIDPOINT	= 2,
-	PAR_INTEGRATE_RK4		= 3
-};
-
 #endif
diff --git a/source/blender/modifiers/intern/MOD_nparticle.c b/source/blender/modifiers/intern/MOD_nparticle.c
index fcf123c..d9429de 100644
--- a/source/blender/modifiers/intern/MOD_nparticle.c
+++ b/source/blender/modifiers/intern/MOD_nparticle.c
@@ -53,9 +53,8 @@
 
 #include "MOD_util.h"
 
-#include "GNO_blender.h"
-
 
+#if 0
 static void npar_system_initData(ModifierData *md) 
 {
 	NParticlesModifierData *pmd= (NParticlesModifierData*) md;
@@ -330,3 +329,4 @@ ModifierTypeInfo modifierType_NParticleEmitter = {
 	/* foreachObjectLink */ NULL,
 	/* foreachIDLink */     npar_modifier_foreachIDLink,
 };
+#endif