Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-05-04 19:49:37 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-05-04 19:49:37 +0300
commit7595c9ecdafc711c29c6ea8b019c67d3ff0421ad (patch)
tree310d4f0f89bae2e90693a47ebbacae58ef46efd1 /intern
parent94a064c0e95871cd23fd6208f56f4e016a418327 (diff)
Cycles: Fix NULL instead of false
Not really noticeable for users, since the compiled code is the same, but semantically this is incorrect.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/osl/osl_services.cpp2
-rw-r--r--intern/cycles/render/image.h2
2 files changed, 2 insertions, 2 deletions
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)