[Bf-blender-cvs] [75be60a6675] master: Fix build error with recent OpenImageIO versions

[Brecht Van Lommel]

Commit: 75be60a66755f96e6d1d9b7e98bd0836784769f6
Author: Brecht Van Lommel
Date:   Thu Mar 12 17:19:30 2020 +0100
Branches: master
https://developer.blender.org/rB75be60a66755f96e6d1d9b7e98bd0836784769f6

Fix build error with recent OpenImageIO versions

===================================================================

M	intern/cycles/render/image.cpp

===================================================================

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index b4539b5ce3c..692f6683e1b 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -150,7 +150,7 @@ int ImageHandle::svm_slot(const int tile_index) const
 
   if (manager->osl_texture_system) {
     ImageManager::Image *img = manager->images[tile_slots[tile_index]];
-    if (img->loader->osl_filepath()) {
+    if (!img->loader->osl_filepath().empty()) {
       return -1;
     }
   }
@@ -394,7 +394,7 @@ int ImageManager::add_image_slot(ImageLoader *loader,
   img->params = params;
   img->loader = loader;
   img->need_metadata = true;
-  img->need_load = !(osl_texture_system && img->loader->osl_filepath());
+  img->need_load = !(osl_texture_system && !img->loader->osl_filepath().empty());
   img->builtin = builtin;
   img->users = 1;
   img->mem = NULL;
@@ -794,7 +794,7 @@ void ImageManager::device_free_image(Device *, int slot)
   if (osl_texture_system) {
 #ifdef WITH_OSL
     ustring filepath = img->loader->osl_filepath();
-    if (filepath) {
+    if (!filepath.empty()) {
       ((OSL::TextureSystem *)osl_texture_system)->invalidate(filepath);
     }
 #endif