Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Samarin <nicks1987@bigmir.net>2011-06-05 22:51:00 +0400
committerNick Samarin <nicks1987@bigmir.net>2011-06-05 22:51:00 +0400
commit5ceb8b3d35706e13580d4eed0f24acc8e57f3464 (patch)
tree8f7a8078b94bc7512abc37baaadedd7ff5fad7f4 /source/blender/makesdna/DNA_object_types.h
parenta918040902bdeb7c9793168710871e4a3b7777a3 (diff)
parent08f44adba965dbf4f7c56eb096b0e2709df80e5c (diff)
synched with trunk at revision 37212
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r--source/blender/makesdna/DNA_object_types.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 24f09fa85a2..f75dab9440c 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -261,6 +261,9 @@ typedef struct Object {
ListBase gpulamp; /* runtime, for lamps only */
ListBase pc_ids;
ListBase *duplilist; /* for temporary dupli list storage, only for use by RNA API */
+
+ float ima_ofs[2]; /* offset for image empties */
+ char pad3[8];
} Object;
/* Warning, this is not used anymore because hooks are now modifiers */
@@ -401,6 +404,7 @@ extern Object workob;
#define OB_CUBE 5
#define OB_EMPTY_SPHERE 6
#define OB_EMPTY_CONE 7
+#define OB_EMPTY_IMAGE 8
/* boundtype */
#define OB_BOUND_BOX 0