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>2015-06-27 10:52:52 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-06-27 11:24:54 +0300
commite78b03f9e9bb8aaba7c02c9f5d26a85ddfe2079c (patch)
treefad5393c904fc8fb75871ea5133d030adb555968
parentab85c5f980533cc9570acc015ec66cb49fc25908 (diff)
Fix part of code in `load_image_single()` wrongly disabled when WITH_OPENEXR was disabled.
-rw-r--r--source/blender/blenkernel/intern/image.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 3cc5905e763..45ae390a5e9 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3441,7 +3441,9 @@ static ImBuf *load_image_single(
ibuf = NULL;
}
}
- else {
+ else
+#endif
+ {
image_initialize_after_load(ima, ibuf);
*r_assign = true;
@@ -3457,10 +3459,6 @@ static ImBuf *load_image_single(
imapf->packedfile = newPackedFile(NULL, filepath, ID_BLEND_PATH(G.main, &ima->id));
}
}
-#else
- image_initialize_after_load(ima, ibuf);
- *r_assign = true;
-#endif
}
else {
ima->ok = 0;