diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 19:51:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 19:51:48 +0400 |
| commit | 4c66e696fbcaefe40f0394fea8fc4a55bb7d6994 (patch) | |
| tree | e8f60920e276ec1fec3c8014b77790a6c790deba /source/blender/editors/space_image | |
| parent | 02987fd5e1fa3715d25bb7b9bd659fd509f40c57 (diff) | |
| parent | b7f3887a3a8a66aeba3a16ae5d76b934af3ccc7c (diff) | |
svn merge ^/trunk/blender -r44136:44189
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index e1fe3788d05..3b7992e0468 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -886,6 +886,11 @@ static int image_replace_exec(bContext *C, wmOperator *op) /* we cant do much if the str is longer then FILE_MAX :/ */ BLI_strncpy(sima->image->name, str, sizeof(sima->image->name)); + if (BLI_testextensie_array(str, imb_ext_movie)) + sima->image->source= IMA_SRC_MOVIE; + else + sima->image->source= IMA_SRC_FILE; + /* XXX unpackImage frees image buffers */ ED_preview_kill_jobs(C); |