[Bf-blender-cvs] [61eba8f] master: Fix T39843: cycles memory leak rendering with high transparent depth.

Brecht Van Lommel noreply at git.blender.org
Fri Apr 25 15:30:21 CEST 2014


Commit: 61eba8fd063b4c4a941205d1e8c1ac150cbe0e12
Author: Brecht Van Lommel
Date:   Fri Apr 25 15:25:34 2014 +0200
https://developer.blender.org/rB61eba8fd063b4c4a941205d1e8c1ac150cbe0e12

Fix T39843: cycles memory leak rendering with high transparent depth.

===================================================================

M	intern/cycles/kernel/kernel_shadow.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_shadow.h b/intern/cycles/kernel/kernel_shadow.h
index c02118f..b350e06 100644
--- a/intern/cycles/kernel/kernel_shadow.h
+++ b/intern/cycles/kernel/kernel_shadow.h
@@ -146,10 +146,6 @@ ccl_device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray *
 				bounce++;
 			}
 
-			/* free dynamic storage */
-			if(hits != hits_stack)
-				free(hits);
-
 #ifdef __VOLUME__
 			/* attenuation for last line segment towards light */
 			if(ps.volume_stack[0].shader != SHADER_NONE)
@@ -158,6 +154,10 @@ ccl_device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray *
 
 			*shadow *= throughput;
 		}
+
+		/* free dynamic storage */
+		if(hits != hits_stack)
+			free(hits);
 	}
 	else {
 		Intersection isect;




More information about the Bf-blender-cvs mailing list