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, 1 insertions, 17 deletions

diff --git a/source/blender/compositor/operations/COM_SplitViewerOperation.cpp b/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
index d59d1f9f10d..7325e32a863 100644
--- a/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
+++ b/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
@@ -62,7 +62,6 @@ void SplitViewerOperation::deinitExecution()
 void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber)
 {
 	float *buffer = this->m_outputBuffer;
-	unsigned char *bufferDisplay = this->m_outputBufferDisplay;
 	
 	if (!buffer) return;
 	int x1 = rect->xmin;
@@ -76,7 +75,6 @@ void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber)
 	for (y = y1; y < y2; y++) {
 		for (x = x1; x < x2; x++) {
 			bool image1;
-			float srgb[4];
 			image1 = this->m_xSplit ? x > perc : y > perc;
 			if (image1) {
 				this->m_image1Input->read(&(buffer[offset]), x, y, COM_PS_NEAREST);
@@ -84,21 +82,7 @@ void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber)
 			else {
 				this->m_image2Input->read(&(buffer[offset]), x, y, COM_PS_NEAREST);
 			}
-			/// @todo: linear conversion only when scene color management is selected, also check predivide.
-			if (this->m_doColorManagement) {
-				if (this->m_doColorPredivide) {
-					linearrgb_to_srgb_predivide_v4(srgb, buffer + offset);
-				}
-				else {
-					linearrgb_to_srgb_v4(srgb, buffer + offset);
-				}
-			}
-			else {
-				copy_v4_v4(srgb, buffer + offset);
-			}
-	
-			rgba_float_to_uchar(bufferDisplay + offset, srgb);
-	
+
 			offset += 4;
 		}
 		offset += (this->getWidth() - (x2 - x1)) * 4;