[Bf-blender-cvs] [7595c9ecdaf] master: Cycles: Fix NULL instead of false

[Sergey Sharybin]

Commit: 7595c9ecdafc711c29c6ea8b019c67d3ff0421ad
Author: Sergey Sharybin
Date:   Sat May 4 18:49:37 2019 +0200
Branches: master
https://developer.blender.org/rB7595c9ecdafc711c29c6ea8b019c67d3ff0421ad

Cycles: Fix NULL instead of false

Not really noticeable for users, since the compiled code is the same,
but semantically this is incorrect.

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

M	intern/cycles/kernel/osl/osl_services.cpp
M	intern/cycles/render/image.h

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

diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index 0257f569f4a..8215f6522db 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -1313,7 +1313,7 @@ bool OSLRenderServices::get_texture_info(OSL::ShaderGlobals *sg,
 
   /* No texture info for other texture types. */
   if (handle && handle->type != OSLTextureHandle::OIIO) {
-    return NULL;
+    return false;
   }
 
   /* Get texture info from OpenImageIO. */
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index c05a65f6c3e..e8ed657ee10 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -56,7 +56,7 @@ class ImageMetaData {
         width(0),
         height(0),
         depth(0),
-        builtin_free_cache(NULL),
+        builtin_free_cache(false),
         type((ImageDataType)0),
         colorspace(u_colorspace_raw),
         compress_as_srgb(false)