diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 16:40:37 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 16:40:37 +0300 |
| commit | 78a8d3685bd3487eb0b5dd55793f94fe7235e377 (patch) | |
| tree | 77f9ba0ddd9613eb7e9dbb8e0402f977548a281f /source/blender/collada | |
| parent | b763c34e80d3b20f9a7f0a592e479e5fa7ab295f (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/collada')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 4173a024552..b77fdf09b20 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -1134,7 +1134,7 @@ bool DocumentImporter::writeImage(const COLLADAFW::Image *image) workpath = imagepath.c_str(); } - Image *ima = BKE_image_load_exists(workpath); + Image *ima = BKE_image_load_exists(CTX_data_main(mContext), workpath); if (!ima) { fprintf(stderr, "Cannot create image: %s\n", workpath); return true; |