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:
authorGeoffroy Krantz <kgeogeo@hotmail.com>2014-01-14 00:57:05 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-01-14 01:18:31 +0400
commitff98be83a977e54039bfdae405df5a79abafeea7 (patch)
tree284f4e61bca5a26f8b1a0fbc7af03be7fc4e6857 /source/blender/blenloader/intern/readfile.c
parente9984653a827f1f5de8e1a1d019854b77afb1ea5 (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/intern/readfile.c')
-rw-r--r--source/blender/blenloader/intern/readfile.c5
1 files changed, 5 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;