Commit: b06a70323c1ae8ead6e1249b70a201fff36c660f
Author: Mai Lavelle
Date: Wed Aug 17 08:42:10 2016 -0400
Branches: master
https://developer.blender.org/rBb06a70323c1ae8ead6e1249b70a201fff36c660f
Cycles: don't crash if OSLRenderServices::osl_ts is unset
===================================================================
M intern/cycles/kernel/osl/osl_services.cpp
===================================================================
diff --git a/intern/cycles/kernel/osl/osl_services.cpp
b/intern/cycles/kernel/osl/osl_services.cpp
index 153ebad..422af32 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
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
