[Bf-blender-cvs] [f3dd1f7] temp-cycles-microdisplacement: Cycles: don't crash if OSLRenderServices::osl_ts is unset

[Mai Lavelle]

Commit: f3dd1f7ac0220142bd59d99c0890df855650423f
Author: Mai Lavelle
Date:   Wed Aug 17 08:42:10 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rBf3dd1f7ac0220142bd59d99c0890df855650423f

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