Fix part of #36594: 16 bit tiff not loading with correct color space in cycles.

1 files changed, 6 insertions, 2 deletions

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 8f33902f961..375d1943436 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -127,10 +127,14 @@ bool ImageManager::is_float_image(const string& filename, void *builtin_data, bo
 
 				is_linear = !(colorspace == "sRGB" ||
 				              colorspace == "GammaCorrected" ||
-							  strcmp(in->format_name(), "png") == 0);
+				              (colorspace == "" &&
+				                  (strcmp(in->format_name(), "png") == 0 ||
+				                   strcmp(in->format_name(), "tiff") == 0 ||
+				                   strcmp(in->format_name(), "jpeg2000") == 0)));
 			}
-			else
+			else {
 				is_linear = false;
+			}
 
 			in->close();
 		}