[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50374] trunk/blender/intern/cycles/kernel /osl/osl_shader.cpp: Fix for bad memory leak in OSL: the context created for each OSL sample did not get released properly.

Lukas Toenne lukas.toenne at googlemail.com
Tue Sep 4 10:53:45 CEST 2012


Revision: 50374
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50374
Author:   lukastoenne
Date:     2012-09-04 08:53:44 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
Fix for bad memory leak in OSL: the context created for each OSL sample did not get released properly.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp

Modified: trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp	2012-09-04 05:36:07 UTC (rev 50373)
+++ trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp	2012-09-04 08:53:44 UTC (rev 50374)
@@ -382,10 +382,8 @@
 void OSLShader::release(KernelGlobals *kg, const ShaderData *sd)
 {
 	OSL::ShadingSystem *ss = kg->osl.ss;
-	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
-	OSL::ShadingContext *ctx = ss->get_context(tdata->thread_info);
-
-	ss->release_context(ctx);
+	
+	ss->release_context((OSL::ShadingContext *)sd->osl_ctx);
 }
 
 /* BSDF Closure */




More information about the Bf-blender-cvs mailing list