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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-06-11 16:40:37 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-06-11 16:40:37 +0300
commit78a8d3685bd3487eb0b5dd55793f94fe7235e377 (patch)
tree77f9ba0ddd9613eb7e9dbb8e0402f977548a281f /source/blender/makesrna/intern/rna_main_api.c
parentb763c34e80d3b20f9a7f0a592e479e5fa7ab295f (diff)
Cleanup: remove moar ugly G.main usages...
BKE_image was an ugly nest, could fix all but the ones from compositor, so moved ugly G.main there, at least we know where the Evil is that way ;)
Diffstat (limited to 'source/blender/makesrna/intern/rna_main_api.c')
-rw-r--r--source/blender/makesrna/intern/rna_main_api.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 7d5c327f25a..6d5ec5f508e 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -338,7 +338,7 @@ static Image *rna_Main_images_load(Main *bmain, ReportList *reports, const char
errno = 0;
if (check_existing) {
- ima = BKE_image_load_exists(filepath);
+ ima = BKE_image_load_exists(bmain, filepath);
}
else {
ima = BKE_image_load(bmain, filepath);