diff options
Diffstat (limited to 'source/blender/freestyle')
-rwxr-xr-x | source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp | 6 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Canvas.cpp | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp index a342fed27e3..321dd5fe41f 100755 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp @@ -203,7 +203,8 @@ namespace StrokeShaders { ifstream ifs(j->c_str()); if (ifs.is_open()) { //soc image.load(j->c_str()); - image = IMB_loadiffname(j->c_str(), 0); + /* OCIO_TODO: support different input color space */ + image = IMB_loadiffname(j->c_str(), 0, NULL); break; } } @@ -350,7 +351,8 @@ namespace StrokeShaders { for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++) { ifstream ifs(j->c_str()); if (ifs.is_open()) { - image = IMB_loadiffname(j->c_str(), 0); //soc + /* OCIO_TODO: support different input color space */ + image = IMB_loadiffname(j->c_str(), 0, NULL); //soc break; } } diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index d67f05ddb92..f2cfe6a855f 100755 --- a/source/blender/freestyle/intern/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp @@ -333,7 +333,8 @@ void Canvas::loadMap(const char *iFileName, const char *iMapName, unsigned int i // return; // } // qimg = &newMap; - ImBuf *qimg = IMB_loadiffname(filePath.c_str(), 0);; + /* OCIO_TODO: support different input color space */ + ImBuf *qimg = IMB_loadiffname(filePath.c_str(), 0, NULL); if( qimg == 0 ){ cout << "Could not load image file " << filePath << endl; return; |