Commit: f6afd1b73c99b5141212b55f911bc2ddca2d6afc
Author: Sergey Sharybin
Date: Tue May 16 09:30:29 2017 +0200
Branches: master
https://developer.blender.org/rBf6afd1b73c99b5141212b55f911bc2ddca2d6afc
Make imbuf's OIIO bindings to compile with latest OIIO from git
===================================================================
M source/blender/imbuf/intern/oiio/openimageio_api.cpp
===================================================================
diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp
b/source/blender/imbuf/intern/oiio/openimageio_api.cpp
index 11bf45418d6..224cf6347d2 100644
--- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp
+++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp
@@ -213,7 +213,7 @@ struct ImBuf *imb_load_photoshop(const char *filename, int
flags, char colorspac
in = ImageInput::create(filename);
if (!in) {
std::cerr << __func__ << ": ImageInput::create() failed:" <<
std::endl
- << OpenImageIO::geterror() << std::endl;
+ << OIIO_NAMESPACE::geterror() << std::endl;
return NULL;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
