diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-11 18:30:53 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-11 18:30:53 +0400 |
| commit | 4f33d65ba1f02f2cd3f340d0123900ea1beffd2c (patch) | |
| tree | 05ef40081ce6be190a171e0fee09b12344e16eb6 /source/blender/editors/space_image | |
| parent | 1ab9fc59b750b1dc5ebaacd30c6891949895a10d (diff) | |
| parent | 79f21f88c2be305962f6432bf8b1af94056fd92b (diff) | |
Cycles: svn merge -r40411:40934 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 45bd1d58a53..33c3ae45a58 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1567,6 +1567,7 @@ static int pack_test(bContext *C, wmOperator *op) static int pack_exec(bContext *C, wmOperator *op) { + struct Main *bmain= CTX_data_main(C); Image *ima= CTX_data_edit_image(C); ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL); int as_png= RNA_boolean_get(op->ptr, "as_png"); @@ -1582,7 +1583,7 @@ static int pack_exec(bContext *C, wmOperator *op) if(as_png) BKE_image_memorypack(ima); else - ima->packedfile= newPackedFile(op->reports, ima->name); + ima->packedfile= newPackedFile(op->reports, ima->name, ID_BLEND_PATH(bmain, &ima->id)); WM_event_add_notifier(C, NC_IMAGE|NA_EDITED, ima); |