diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-07 16:18:15 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-07 16:18:15 +0400 |
commit | c05896eb35e61918ccbfc8deaf7312895fcade36 (patch) | |
tree | dba07d6ddf9ed96bae4f62fadb4f678e6adf37de /source | |
parent | 08444518e62b4c7154c1428c33adab842774aa30 (diff) |
Fix for own commit: particle rng arrays should be declared extern in the
header.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index d87b2090712..877aafe67a4 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -247,9 +247,9 @@ typedef struct ParticleDrawData { #define PARTICLE_DRAW_DATA_UPDATED 1 #define PSYS_FRAND_COUNT 1024 -unsigned int PSYS_FRAND_SEED_OFFSET[PSYS_FRAND_COUNT]; -unsigned int PSYS_FRAND_SEED_MULTIPLIER[PSYS_FRAND_COUNT]; -float PSYS_FRAND_BASE[PSYS_FRAND_COUNT]; +extern unsigned int PSYS_FRAND_SEED_OFFSET[PSYS_FRAND_COUNT]; +extern unsigned int PSYS_FRAND_SEED_MULTIPLIER[PSYS_FRAND_COUNT]; +extern float PSYS_FRAND_BASE[PSYS_FRAND_COUNT]; void psys_init_rng(void); diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 48db07d45eb..10889763638 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -85,6 +85,10 @@ #include "RE_render_ext.h" +unsigned int PSYS_FRAND_SEED_OFFSET[PSYS_FRAND_COUNT]; +unsigned int PSYS_FRAND_SEED_MULTIPLIER[PSYS_FRAND_COUNT]; +float PSYS_FRAND_BASE[PSYS_FRAND_COUNT]; + void psys_init_rng(void) { int i; |