diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 11:57:55 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 11:57:55 +0400 |
| commit | 5b5e600db6f529ad7e1af9d4bb3a193be2265342 (patch) | |
| tree | 224486ae4d65cd7903c2ab0bff2f43357099cb00 /source/blender/makesdna/DNA_speaker_types.h | |
| parent | 5bac37f6d4d2e8d584ae0ec6bafd2808c47fbb25 (diff) | |
Last bunch of minor fixes before merge.
* Use NULL in AUD_Reference.h
* Use SETLOOPER in sound.c
* Move flags to the end of Speaker struct.
Diffstat (limited to 'source/blender/makesdna/DNA_speaker_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_speaker_types.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_speaker_types.h b/source/blender/makesdna/DNA_speaker_types.h index 50cb62c79e5..fecc65885c5 100644 --- a/source/blender/makesdna/DNA_speaker_types.h +++ b/source/blender/makesdna/DNA_speaker_types.h @@ -39,9 +39,6 @@ typedef struct Speaker { struct bSound *sound; - short flag; - short pad1[3]; - // not animatable properties float volume_max; float volume_min; @@ -55,6 +52,10 @@ typedef struct Speaker { // animatable properties float volume; float pitch; + + // flag + short flag; + short pad1[3]; } Speaker; /* **************** SPEAKER ********************* */ |