diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-12 00:28:47 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-12 00:28:47 +0400 |
| commit | c785d7493ea72797afd369152e929f80f88795ae (patch) | |
| tree | 9758fc7dd8a1b902603c79ec34eaa5680b3ecbe4 /source/blender/makesdna | |
| parent | fd9ad582983939741a4c4fa5f2707f29365d6c09 (diff) | |
| parent | 96486b356f7d035a7abc835adbef850c3f314264 (diff) | |
soc-2008-mxcurioni: merged changes to revision 14798, compilation works for rendering/ directry. Still needs to figure out how to compile on non-Unix machines.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index e5f781a3365..4f62cd084cc 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -168,7 +168,7 @@ typedef struct ParticleSettings { struct PartDeflect *pd; } ParticleSettings; -typedef struct ParticleSystem{ +typedef struct ParticleSystem{ /* note, make sure all (runtime) are NULL's in copy_particlesystem */ struct ParticleSystem *next, *prev; ParticleSettings *part; /* particle settings */ @@ -199,7 +199,7 @@ typedef struct ParticleSystem{ char bb_uvname[3][32]; /* billboard uv name */ /* if you change these remember to update array lengths to PSYS_TOT_VG! */ - short vgroup[11], vg_neg, rt3[2]; /* vertex groups */ + short vgroup[12], vg_neg, rt3; /* vertex groups */ /* temporary storage during render */ void *renderdata; |