[Bf-blender-cvs] [f94b009] : Fix for own commit: particle rng arrays should be declared extern in the header.

Lukas Tönne noreply at git.blender.org
Wed Mar 12 18:15:47 CET 2014


Commit: f94b009d41f3e7fcbba6cdf1c46f13a4ec433e70
Author: Lukas Tönne
Date:   Fri Mar 7 13:18:15 2014 +0100
https://developer.blender.org/rBf94b009d41f3e7fcbba6cdf1c46f13a4ec433e70

Fix for own commit: particle rng arrays should be declared extern in the
header.

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

M	source/blender/blenkernel/BKE_particle.h
M	source/blender/blenkernel/intern/particle.c

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

diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index d87b209..877aafe 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 4f4964c..3a6e710 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;




More information about the Bf-blender-cvs mailing list