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/gameengine/Expressions/Operator2Expr.cpp

@@ -102,7 +102,7 @@ and m_rhs
 		
 		m_cached_calculate = ffleft->Calc(m_op,ffright);
 		
-		//if (m_cached_calculate)				
+		//if (m_cached_calculate)
 		//	m_cached_calculate->Action(CValue::SETOWNEREXPR,&CVoidValue(this,false,CValue::STACKVALUE));
 
 		ffleft->Release();
@@ -163,7 +163,7 @@ bool COperator2Expr::IsInside(float x, float y, float z,bool bBorderInclude)
 			}
 	}
 	
-	return inside;	
+	return inside;
 }
 
 
@@ -241,7 +241,7 @@ CExpression* COperator2Expr::CheckLink(std::vector<CBrokenLinkInfo*>& brokenlink
 	
 	if (m_rhs)
 		return Release(m_rhs->AddRef());
-/		
+/
 
   */
 	return Release();