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:
authorCampbell Barton <ideasman42@gmail.com>2018-06-17 17:18:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-17 17:18:15 +0300
commit56173e512cab020a5bc96e6d3069641a03d47fbe (patch)
tree112fcb93a1898fadb34c2b74ae32471a6364a969 /source/blender/editors/space_image
parent6855d537e3112f7ba4d84524d06a524b0ea9f7b1 (diff)
parenta0a1fc89387f0f1396b5e4320c2dd4a6fedd1c25 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r--source/blender/editors/space_image/image_ops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 44ff1086e27..b852788f3bb 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1538,7 +1538,7 @@ static int image_replace_exec(bContext *C, wmOperator *op)
BKE_image_signal(bmain, sima->image, &sima->iuser, IMA_SIGNAL_SRC_CHANGE);
}
- if (BLI_testextensie_array(str, imb_ext_movie))
+ if (BLI_path_extension_check_array(str, imb_ext_movie))
sima->image->source = IMA_SRC_MOVIE;
else
sima->image->source = IMA_SRC_FILE;