[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55725] trunk/blender/intern/cycles/kernel /kernel_bvh.h: Fix #34832: SSS render freeze with object instances.

[Brecht Van Lommel]

Revision: 55725
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55725
Author:   blendix
Date:     2013-04-02 14:19:05 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Fix #34832: SSS render freeze with object instances.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_bvh.h

Modified: trunk/blender/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-04-02 13:34:50 UTC (rev 55724)
+++ trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-04-02 14:19:05 UTC (rev 55725)
@@ -1075,6 +1075,11 @@
 
 						nodeAddr = kernel_tex_fetch(__object_node, object);
 					}
+					else {
+						/* pop */
+						nodeAddr = traversalStack[stackPtr];
+						--stackPtr;
+					}
 				}
 #endif
 			}
@@ -1204,6 +1209,11 @@
 
 						nodeAddr = kernel_tex_fetch(__object_node, object);
 					}
+					else {
+						/* pop */
+						nodeAddr = traversalStack[stackPtr];
+						--stackPtr;
+					}
 				}
 			}
 		} while(nodeAddr != ENTRYPOINT_SENTINEL);
@@ -1235,8 +1245,6 @@
 #endif
 }
 
-
-
 /* Ray offset to avoid self intersection */
 
 __device_inline float3 ray_offset(float3 P, float3 Ng)