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:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-01-05 11:25:02 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-01-05 11:25:02 +0400
commita3f3c205cd89a687199723294f3fb029c48429b7 (patch)
tree152628fa1e34b1ad60c0e7b28fb2d3e1d7cc3443
parent3b3d419dcb534e12a3b58ef792a6ce287bb113be (diff)
Fix #33768: BGE segfaults in do_versions during libload
-rw-r--r--source/blender/blenloader/intern/readfile.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 7827a3a9bf1..9ca393a946b 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8594,10 +8594,10 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
for (tex = main->tex.first; tex; tex = tex->id.next) {
if (tex->type == TEX_IMAGE && (tex->imaflag & TEX_USEALPHA) == 0) {
- if (tex->ima) {
- image = blo_do_versions_newlibadr(fd, lib, tex->ima);
+ image = blo_do_versions_newlibadr(fd, tex->id.lib, tex->ima);
+
+ if (image)
image->flag |= IMA_IGNORE_ALPHA;
- }
}
}
}