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/editors | |
| 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/editors')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 2e62872724c..c2fbd09281c 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -734,7 +734,8 @@ static int object_empty_add_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; ob = ED_object_add_type(C, OB_EMPTY, loc, rot, FALSE, layer); - ob->empty_drawtype = type; + + BKE_object_empty_draw_type_set(ob, type); return OPERATOR_FINISHED; } diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index b223308a6f4..e5aed93a953 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -554,7 +554,7 @@ void drawaxes(float size, char drawtype) static void draw_empty_image(Object *ob, const short dflag, const unsigned char ob_wire_col[4]) { Image *ima = (Image *)ob->data; - ImBuf *ibuf = ima ? BKE_image_acquire_ibuf(ima, NULL, NULL) : NULL; + ImBuf *ibuf = BKE_image_acquire_ibuf(ima, ob->iuser, NULL); float scale, ofs_x, ofs_y, sca_x, sca_y; int ima_x, ima_y; |