[Bf-blender-cvs] [8f9e1bc] blender-v2.75-release: Fix part of code in `load_image_single()` wrongly disabled when WITH_OPENEXR was disabled.
Bastien Montagne
noreply at git.blender.org
Mon Jun 29 16:18:39 CEST 2015
Commit: 8f9e1bcad58d69d394b58348508bb673645ee956
Author: Bastien Montagne
Date: Sat Jun 27 09:52:52 2015 +0200
Branches: blender-v2.75-release
https://developer.blender.org/rB8f9e1bcad58d69d394b58348508bb673645ee956
Fix part of code in `load_image_single()` wrongly disabled when WITH_OPENEXR was disabled.
===================================================================
M source/blender/blenkernel/intern/image.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 31d2f88..77256d3 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3439,7 +3439,9 @@ static ImBuf *load_image_single(
ibuf = NULL;
}
}
- else {
+ else
+#endif
+ {
image_initialize_after_load(ima, ibuf);
*r_assign = true;
@@ -3455,10 +3457,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;
More information about the Bf-blender-cvs
mailing list