From c05896eb35e61918ccbfc8deaf7312895fcade36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= <lukas.toenne@gmail.com> Date: Fri, 7 Mar 2014 13:18:15 +0100 Subject: [PATCH] Fix for own commit: particle rng arrays should be declared extern in the header. --- source/blender/blenkernel/BKE_particle.h | 6 +++--- 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; -- GitLab