[Bf-blender-cvs] [9800ed5] master: Code cleanup: replace magic constants with more verbose bitnames
Sergey Sharybin
noreply at git.blender.org
Wed Feb 5 18:46:55 CET 2014
Commit: 9800ed5f6d0a31dd075363ac2e0ba80842e20443
Author: Sergey Sharybin
Date: Wed Feb 5 21:30:18 2014 +0600
https://developer.blender.org/rB9800ed5f6d0a31dd075363ac2e0ba80842e20443
Code cleanup: replace magic constants with more verbose bitnames
===================================================================
M source/blender/makesdna/DNA_particle_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 4f4be39..170d137 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -564,7 +564,7 @@ typedef struct ParticleSystem {
/* mapto */
/* init */
-#define PAMAP_INIT 15
+#define PAMAP_INIT (PAMAP_TIME | PAMAP_LIFE | PAMAP_DENS | PAMAP_SIZE)
#define PAMAP_TIME (1<<0) /* emission time */
#define PAMAP_LIFE (1<<1) /* life time */
#define PAMAP_DENS (1<<2) /* density */
@@ -572,12 +572,12 @@ typedef struct ParticleSystem {
/* reset */
#define PAMAP_IVEL (1<<5) /* initial velocity */
/* physics */
-#define PAMAP_PHYSICS 3136
+#define PAMAP_PHYSICS (PAMAP_FIELD | PAMAP_GRAVITY | PAMAP_DAMP)
#define PAMAP_FIELD (1<<6) /* force fields */
#define PAMAP_GRAVITY (1<<10)
#define PAMAP_DAMP (1<<11)
/* children */
-#define PAMAP_CHILD 912
+#define PAMAP_CHILD (PAMAP_CLUMP | PAMAP_KINK | PAMAP_ROUGH | PAMAP_LENGTH)
#define PAMAP_CLUMP (1<<7)
#define PAMAP_KINK (1<<8)
#define PAMAP_ROUGH (1<<9)
More information about the Bf-blender-cvs
mailing list