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
diff options
context:
space:
mode:
authorMai Lavelle <mai.lavelle@gmail.com>2016-08-17 15:42:10 +0300
committerMai Lavelle <mai.lavelle@gmail.com>2016-08-31 03:50:22 +0300
commitb06a70323c1ae8ead6e1249b70a201fff36c660f (patch)
tree3e5c2f1eecf0f6d8cd750d77183240b8ac9159c6
parent23e3b9f35bef214d3bdf3477d14343f29e4cf672 (diff)
Cycles: don't crash if OSLRenderServices::osl_ts is unset
-rw-r--r--intern/cycles/kernel/osl/osl_services.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index 153ebad6cd2..422af32ee79 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -127,8 +127,10 @@ OSLRenderServices::OSLRenderServices()
OSLRenderServices::~OSLRenderServices()
{
- VLOG(2) << "OSL texture system stats:\n"
- << osl_ts->getstats();
+ if(osl_ts) {
+ VLOG(2) << "OSL texture system stats:\n"
+ << osl_ts->getstats();
+ }
#ifdef WITH_PTEX
ptex_cache->release();
#endif