diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-13 10:39:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-13 10:39:17 +0400 |
commit | b310a76a1b8964fd776620f8444c1c1a7a308a8e (patch) | |
tree | dcf2b80af79403c2b5fb81c85e337f4adc3eba2f /source/blender/makesdna/DNA_object_types.h | |
parent | c58fb76f1a043124debf2a71e6c56f2a478a0dde (diff) | |
parent | 047e8224b14aa7836db3b067824258e49e8602db (diff) |
svn merge -r39558:39800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index b1b3e779824..820b244ca6c 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -308,6 +308,8 @@ typedef struct DupliObject { #define OB_LAMP 10 #define OB_CAMERA 11 +#define OB_SPEAKER 12 + // #define OB_WAVE 21 #define OB_LATTICE 22 |