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.

1 files changed, 4 insertions, 2 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;
       }
     }