diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
| commit | a42ba82f638e481d7fd3c3ed2ba05c331ef6717e (patch) | |
| tree | 81a2b9221799707b49b74a5df8bb3ff964ba78bd /source/blender/freestyle/intern/stroke/Canvas.cpp | |
| parent | 7afbdff1b6c348227e652e1c3071ab7ba7c91c44 (diff) | |
| parent | a73dd3476e7d180d3320afc04d218ce22f2f3bfc (diff) | |
Merged changes in the trunk up to revision 50829.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material). OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
Diffstat (limited to 'source/blender/freestyle/intern/stroke/Canvas.cpp')
| -rwxr-xr-x | source/blender/freestyle/intern/stroke/Canvas.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; |