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.

source/creator/CMakeLists.txt

@@ -302,6 +302,15 @@ if(WITH_INTERNATIONAL)
 	)
 endif()
 
+# color management
+if(WITH_OPENCOLORIO)
+	install(
+		DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/colormanagement
+		DESTINATION ${TARGETDIR_VER}/datafiles
+		PATTERN ".svn" EXCLUDE
+	)
+endif()
+
 # helpful tip when using make
 if("${CMAKE_GENERATOR}" MATCHES ".*Makefiles.*")
 	# message after building.
@@ -637,6 +646,23 @@ elseif(WIN32)
 		endif()
 	endif()
 
+	if(WITH_OPENCOLORIO)
+		set_lib_path(OCIOBIN "opencolorio/bin")
+		if(NOT MINGW)
+			install(
+				FILES
+					${OCIOBIN}/OpenColorIO.dll
+				DESTINATION ${TARGETDIR}
+			)
+		else()
+			install(
+				FILES
+					${OCIOBIN}/libOpenColorIO.dll
+				DESTINATION ${TARGETDIR}
+			)
+		endif()
+	endif()
+
 elseif(APPLE)
 
 	# handy install macro to exclude files, we use \$ escape for the "to"
@@ -909,6 +935,7 @@ endif()
 		cycles_util
 		cycles_subd
 		bf_intern_raskter
+		bf_intern_opencolorio
 	)
 
 	if(WITH_COMPOSITOR)