diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-16 08:21:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-16 08:21:40 +0400 |
| commit | 30dddb9840e1566e50c5aacc70bd4b2865c7fa56 (patch) | |
| tree | ba32df1f6f4b2ba843233cf076a07f388481cb01 /source/blender | |
| parent | a0feea1fc07fb228c792d5bd20106508fbdb62e7 (diff) | |
fix for replacing a generated image with a file, the image would stay generated.
not a show-stopper but confusing.
Diffstat (limited to 'source/blender')
| -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); |