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/GameLogic/SCA_IInputDevice.cpp

@@ -45,7 +45,7 @@ SCA_IInputDevice::SCA_IInputDevice()
 
 SCA_IInputDevice::~SCA_IInputDevice()
 {
-}	
+}
 
 void SCA_IInputDevice::HookEscape()
 {
@@ -134,6 +134,6 @@ void SCA_IInputDevice::NextFrame()
 			break;
 		default:
 			; /* error */
-		}	
+		}
 	}
 }