[Bf-blender-cvs] [689d660] particles_refactor: Removed deprecated DNA data inside #if 0 block, C preprocessor doesn't work with makesdna.

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


Commit: 689d660adff7fef6ffbe1d1bca4f6f246603e3cf
Author: Lukas Tönne
Date:   Thu Dec 12 10:02:03 2013 +0100
https://developer.blender.org/rB689d660adff7fef6ffbe1d1bca4f6f246603e3cf

Removed deprecated DNA data inside #if 0 block, C preprocessor doesn't
work with makesdna.

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

M	source/blender/makesdna/DNA_nparticle_types.h

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

diff --git a/source/blender/makesdna/DNA_nparticle_types.h b/source/blender/makesdna/DNA_nparticle_types.h
index fe461ab..a592f87 100644
--- a/source/blender/makesdna/DNA_nparticle_types.h
+++ b/source/blender/makesdna/DNA_nparticle_types.h
@@ -64,103 +64,4 @@ typedef struct NParticleBuffer {
 	ListBase attributes;
 } NParticleBuffer;
 
-
-#if 0
-#include "BLO_sys_types.h"	/* for uint64_t */
-
-#include "DNA_ID.h"
-
-#include "DNA_node_types.h"
-
-
-/* Standard attribute types */
-/* XXX Warning! when adding attributes here, make sure to update
- * the attribute functions in nparticles.c accordingly!
- * Also make sure the PAR_ATTR_TYPE_MAX below is > than this.
- */
-enum NodeParAttributeStandard {
-	PAR_ATTR_TYPE_UNDEFINED         = -1,
-	
-	PAR_ATTR_TYPE_CUSTOM            = 0,
-	
-	PAR_ATTR_TYPE_FLAG              = 10,
-	PAR_ATTR_TYPE_ID                = 11,
-	PAR_ATTR_TYPE_SOURCE_ID         = 12,
-	PAR_ATTR_TYPE_RANDOM_SEED       = 13,
-	PAR_ATTR_TYPE_REM_INDEX         = 14,
-	
-	PAR_ATTR_TYPE_BIRTH_TIME        = 20,
-	PAR_ATTR_TYPE_POSITION          = 21,
-	PAR_ATTR_TYPE_VELOCITY          = 22,
-	PAR_ATTR_TYPE_FORCE             = 23,
-	PAR_ATTR_TYPE_MASS              = 24,
-	PAR_ATTR_TYPE_ROTATION          = 25,
-	PAR_ATTR_TYPE_ANGULAR_VELOCITY  = 26,
-	PAR_ATTR_TYPE_TORQUE            = 27,
-	PAR_ATTR_TYPE_ANGULAR_MASS      = 28
-};
-
-
-/* ******** Various specialized typedefs for attributes ******** */
-/* data type of the flag attribute layer */
-typedef int NParticleFlagLayerType;
-
-/* Random number generator implementation */
-#define NPAR_RANDOM_LCG             1
-#define NPAR_RANDOM_RNGSTREAMS      2
-
-#define NPAR_RANDOM NPAR_RANDOM_LCG		/* used rng mode */
-
-#if NPAR_RANDOM == NPAR_RANDOM_LCG
-typedef struct NParticleRNG {
-	uint64_t Cg;
-} NParticleRNG;
-#elif NPAR_RANDOM == NPAR_RANDOM_RNGSTREAMS
-/* MRG32k3a state size */
-typedef struct NParticleRNG {
-	double Cg[6];
-} NParticleRNG;
-#endif
-
-typedef struct NParticleVector {
-	float x, y, z;
-} NParticleVector;
-
-typedef struct NParticleQuaternion {
-	float w, x, y, z;
-} NParticleQuaternion;
-
-typedef struct NParticleColor {
-	float r, g, b, a;
-} NParticleColor;
-
-typedef struct NParticleMeshLocation {
-	unsigned int v1, v2, v3, v4;	/* vertex indices */
-	float weight[4];				/* factor for simplex edges */
-	unsigned int face;				/* optional, only for surface location */
-	int pad;
-} NParticleMeshLocation;
-
-/* **************** */
-
-
-typedef struct bNodeInstanceMap {
-	/* XXX for now just a simple ListBase, might use a hash later on */
-	ListBase lb;
-} bNodeInstanceMap;
-
-
-typedef struct NParticleSource {
-	int id;
-	int next_element_id;
-	NParticleRNG rng;
-	/** Emission counter carry.
-	 * Uses a float value here so that small emission rates
-	 * can add up smoothly over several timesteps.
-	 */
-	float emit_carry;
-	int pad;
-} NParticleSource;
-#endif
-
 #endif




More information about the Bf-blender-cvs mailing list