diff options
author | Geoffroy Krantz <kgeogeo@hotmail.com> | 2014-01-14 00:57:05 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-14 01:18:31 +0400 |
commit | ff98be83a977e54039bfdae405df5a79abafeea7 (patch) | |
tree | 284f4e61bca5a26f8b1a0fbc7af03be7fc4e6857 /source/blender/blenloader | |
parent | e9984653a827f1f5de8e1a1d019854b77afb1ea5 (diff) |
Empties with Images draw type: add support for movies and image sequences
This adds an ImageUser to such empties with all the typical settings.
Reviewed By: brecht, campbellbarton
Differential Revision: https://developer.blender.org/D108
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index fe867ae0dc5..587b1e29c60 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5024,6 +5024,11 @@ static void direct_link_object(FileData *fd, Object *ob) MEM_freeN(hook); } + ob->iuser = newdataadr(fd, ob->iuser); + if (ob->type == OB_EMPTY && ob->empty_drawtype == OB_EMPTY_IMAGE && !ob->iuser) { + BKE_object_empty_draw_type_set(ob, ob->empty_drawtype); + } + ob->customdata_mask = 0; ob->bb = NULL; ob->derivedDeform = NULL; diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index beb8d584e41..b60459e2477 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1535,6 +1535,10 @@ static void write_objects(WriteData *wd, ListBase *idbase) writestruct(wd, DATA, "RigidBodyCon", 1, ob->rigidbody_constraint); } + if (ob->type == OB_EMPTY && ob->empty_drawtype == OB_EMPTY_IMAGE) { + writestruct(wd, DATA, "ImageUser", 1, ob->iuser); + } + write_particlesystems(wd, &ob->particlesystem); write_modifiers(wd, &ob->modifiers); |